From f06e8aff54ff7d494793a30860d48141455be5f0 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot <yoshi-automation@google.com>
Date: Mon, 3 Aug 2020 12:56:39 -0700
Subject: [PATCH] feat: added support for custom content types (#250)

* changes without context

        autosynth cannot find the source of changes triggered by earlier changes in this
        repository, or by version upgrades to tools such as linters.

* fix: publish missing client config annotations

PiperOrigin-RevId: 322420178

Source-Author: Google APIs <noreply@google.com>
Source-Date: Tue Jul 21 12:43:47 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: be0c5a9b1b88ca3bb8ad993ae7b2e6affde7fee2
Source-Link: https://github.com/googleapis/googleapis/commit/be0c5a9b1b88ca3bb8ad993ae7b2e6affde7fee2

* fix!: migrate dialogflow/v2beta1 to gapic v2

PiperOrigin-RevId: 322667213

Source-Author: Google APIs <noreply@google.com>
Source-Date: Wed Jul 22 15:22:03 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 1d3ca22734bfd1c00d229e49009547c43f2d7a48
Source-Link: https://github.com/googleapis/googleapis/commit/1d3ca22734bfd1c00d229e49009547c43f2d7a48

* docs: more detailed docs on APIs such as Environment, Intents, Sessions.

PiperOrigin-RevId: 323086730

Source-Author: Google APIs <noreply@google.com>
Source-Date: Fri Jul 24 15:42:41 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: a6b2dac798ed266136e990a2319b2e2e96f3bdbe
Source-Link: https://github.com/googleapis/googleapis/commit/a6b2dac798ed266136e990a2319b2e2e96f3bdbe

* feat: added support for custom content types docs: clarified wording around quota usage

PiperOrigin-RevId: 323397413

Source-Author: Google APIs <noreply@google.com>
Source-Date: Mon Jul 27 11:04:11 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: ca22cfe3477f1c0095fba606d5a18c52d918a0dd
Source-Link: https://github.com/googleapis/googleapis/commit/ca22cfe3477f1c0095fba606d5a18c52d918a0dd

* feat: added support for custom content types docs: clarified wording around quota usage

PiperOrigin-RevId: 323436667

Source-Author: Google APIs <noreply@google.com>
Source-Date: Mon Jul 27 14:05:51 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 546f389d95dbbc88d9d5a00fae25b29d49a0d5b6
Source-Link: https://github.com/googleapis/googleapis/commit/546f389d95dbbc88d9d5a00fae25b29d49a0d5b6

* chore: allow resource name change from ProjectAgentName to AgentName

Co-authored-by: Jeff Ching <chingor@google.com>
---
 google-cloud-dialogflow-bom/pom.xml           |   2 +-
 .../clirr-ignored-differences.xml             |  23 +-
 .../cloud/dialogflow/v2/ContextsClient.java   |  16 +-
 .../dialogflow/v2/EntityTypesClient.java      |  26 +-
 .../dialogflow/v2/EnvironmentsClient.java     |   2 +-
 .../cloud/dialogflow/v2/IntentsClient.java    |  28 +-
 .../v2/SessionEntityTypesClient.java          |  15 +-
 .../cloud/dialogflow/v2/SessionsClient.java   |  12 +-
 .../cloud/dialogflow/v2/package-info.java     |  97 +--
 .../dialogflow/v2beta1/AgentsClient.java      | 303 +++++--
 .../dialogflow/v2beta1/AgentsSettings.java    |  26 +-
 .../dialogflow/v2beta1/ContextsClient.java    |  69 +-
 .../dialogflow/v2beta1/DocumentsClient.java   |  81 +-
 .../dialogflow/v2beta1/DocumentsSettings.java |  17 +
 .../dialogflow/v2beta1/EntityTypesClient.java | 152 ++--
 .../v2beta1/EnvironmentsClient.java           |  14 +-
 .../dialogflow/v2beta1/IntentsClient.java     | 119 ++-
 .../v2beta1/KnowledgeBasesClient.java         |  33 +
 .../v2beta1/SessionEntityTypesClient.java     |  68 +-
 .../dialogflow/v2beta1/SessionsClient.java    |  10 +-
 .../dialogflow/v2beta1/package-info.java      |  48 +-
 .../dialogflow/v2beta1/stub/AgentsStub.java   |   8 +-
 .../v2beta1/stub/AgentsStubSettings.java      | 156 ++--
 .../v2beta1/stub/ContextsStubSettings.java    |  80 +-
 .../v2beta1/stub/DocumentsStub.java           |   6 +
 .../v2beta1/stub/DocumentsStubSettings.java   | 141 +++-
 .../v2beta1/stub/EntityTypesStubSettings.java | 116 ++-
 .../stub/EnvironmentsStubSettings.java        |  60 +-
 .../v2beta1/stub/GrpcAgentsStub.java          |  56 +-
 .../v2beta1/stub/GrpcDocumentsStub.java       |  14 +
 .../v2beta1/stub/IntentsStubSettings.java     |  92 ++-
 .../stub/KnowledgeBasesStubSettings.java      |  76 +-
 .../stub/SessionEntityTypesStubSettings.java  |  76 +-
 .../v2beta1/stub/SessionsStubSettings.java    |  60 +-
 .../dialogflow/v2beta1/AgentsClientTest.java  | 103 +--
 .../v2beta1/ContextsClientTest.java           |  92 ++-
 .../v2beta1/DocumentsClientTest.java          | 120 ++-
 .../v2beta1/EntityTypesClientTest.java        | 136 ++--
 .../v2beta1/EnvironmentsClientTest.java       |  12 +-
 .../dialogflow/v2beta1/IntentsClientTest.java | 217 ++++-
 .../v2beta1/KnowledgeBasesClientTest.java     |  63 +-
 .../v2beta1/SessionEntityTypesClientTest.java |  78 +-
 .../v2beta1/SessionsClientTest.java           |  10 +-
 .../cloud/dialogflow/v2/ContextsGrpc.java     |  85 +-
 .../cloud/dialogflow/v2/EntityTypesGrpc.java  | 115 +--
 .../cloud/dialogflow/v2/EnvironmentsGrpc.java |  10 +-
 .../cloud/dialogflow/v2/IntentsGrpc.java      | 140 +---
 .../dialogflow/v2/SessionEntityTypesGrpc.java |  75 +-
 .../cloud/dialogflow/v2/SessionsGrpc.java     |  35 +-
 .../com/google/cloud/dialogflow/v2/Agent.java |   6 +-
 .../google/cloud/dialogflow/v2/Context.java   |  28 +-
 .../dialogflow/v2/DetectIntentRequest.java    |  14 +
 .../v2/DetectIntentRequestOrBuilder.java      |   4 +
 .../cloud/dialogflow/v2/EntityType.java       |  26 +-
 .../cloud/dialogflow/v2/Environment.java      |  30 +-
 .../google/cloud/dialogflow/v2/Intent.java    |  22 +-
 .../v2/SentimentAnalysisResult.java           |  24 +-
 .../dialogflow/v2/SessionEntityType.java      |  24 +-
 .../v2/StreamingDetectIntentRequest.java      |  14 +
 ...StreamingDetectIntentRequestOrBuilder.java |   4 +
 .../google/cloud/dialogflow/v2/agent.proto    |   3 +-
 .../cloud/dialogflow/v2/audio_config.proto    |   1 +
 .../google/cloud/dialogflow/v2/context.proto  |  35 +-
 .../cloud/dialogflow/v2/entity_type.proto     |  44 +-
 .../cloud/dialogflow/v2/environment.proto     |  21 +-
 .../google/cloud/dialogflow/v2/intent.proto   |  45 +-
 .../google/cloud/dialogflow/v2/session.proto  |  26 +-
 .../dialogflow/v2/session_entity_type.proto   |  31 +-
 .../cloud/dialogflow/v2beta1/AgentName.java   | 270 +++++++
 .../cloud/dialogflow/v2beta1/AgentProto.java  | 179 ++---
 ...oApproveSmartMessagingEntriesResponse.java | 753 ++++++++++++++++++
 ...martMessagingEntriesResponseOrBuilder.java |  64 ++
 .../v2beta1/BatchCreateEntitiesRequest.java   |  92 ++-
 .../BatchCreateEntitiesRequestOrBuilder.java  |  20 +-
 .../v2beta1/BatchDeleteEntitiesRequest.java   |  26 +-
 .../BatchDeleteEntitiesRequestOrBuilder.java  |   8 +-
 .../v2beta1/BatchDeleteIntentsRequest.java    |  92 ++-
 .../BatchDeleteIntentsRequestOrBuilder.java   |  20 +-
 .../v2beta1/BatchUpdateEntitiesRequest.java   |  92 ++-
 .../BatchUpdateEntitiesRequestOrBuilder.java  |  20 +-
 .../cloud/dialogflow/v2beta1/ContextName.java | 366 ++++++++-
 .../dialogflow/v2beta1/ContextProto.java      |  64 +-
 .../v2beta1/CreateIntentRequest.java          |  48 +-
 .../v2beta1/CreateIntentRequestOrBuilder.java |  12 +-
 .../CreateSessionEntityTypeRequest.java       |  48 +-
 ...eateSessionEntityTypeRequestOrBuilder.java |  12 +-
 .../v2beta1/DetectIntentRequest.java          |  76 +-
 .../v2beta1/DetectIntentRequestOrBuilder.java |  20 +-
 .../dialogflow/v2beta1/DocumentProto.java     | 119 +--
 .../dialogflow/v2beta1/EntityTypeName.java    | 180 ++++-
 .../dialogflow/v2beta1/EntityTypeProto.java   | 214 ++---
 .../dialogflow/v2beta1/EnvironmentName.java   | 180 ++++-
 .../dialogflow/v2beta1/EnvironmentProto.java  |  43 +-
 .../v2beta1/ExportAgentRequest.java           |  28 +-
 .../v2beta1/ExportAgentRequestOrBuilder.java  |   8 +-
 .../cloud/dialogflow/v2beta1/IntentName.java  | 179 ++++-
 .../cloud/dialogflow/v2beta1/IntentProto.java | 179 ++---
 .../v2beta1/KnowledgeBaseProto.java           |  24 +-
 .../dialogflow/v2beta1/LocationName.java      | 182 +++++
 .../v2beta1/SessionEntityTypeName.java        | 370 ++++++++-
 .../v2beta1/SessionEntityTypeProto.java       | 170 ++--
 .../cloud/dialogflow/v2beta1/SessionName.java | 304 ++++++-
 .../dialogflow/v2beta1/SessionProto.java      | 279 +++----
 .../dialogflow/v2beta1/SetAgentRequest.java   |  48 +-
 .../v2beta1/SetAgentRequestOrBuilder.java     |  12 +-
 .../v2beta1/StreamingDetectIntentRequest.java |  62 +-
 ...StreamingDetectIntentRequestOrBuilder.java |  16 +-
 .../v2beta1/UpdateIntentRequest.java          |  48 +-
 .../v2beta1/UpdateIntentRequestOrBuilder.java |  12 +-
 .../UpdateSessionEntityTypeRequest.java       |  48 +-
 ...dateSessionEntityTypeRequestOrBuilder.java |  12 +-
 .../cloud/dialogflow/v2beta1/agent.proto      |   9 +-
 .../dialogflow/v2beta1/audio_config.proto     |  59 +-
 .../cloud/dialogflow/v2beta1/context.proto    |   1 +
 .../cloud/dialogflow/v2beta1/document.proto   |  13 +
 .../dialogflow/v2beta1/entity_type.proto      |   8 +-
 .../dialogflow/v2beta1/environment.proto      |   3 +-
 .../cloud/dialogflow/v2beta1/intent.proto     |   7 +-
 .../dialogflow/v2beta1/knowledge_base.proto   |   1 +
 .../cloud/dialogflow/v2beta1/session.proto    |  15 +-
 .../v2beta1/session_entity_type.proto         |   4 +-
 synth.metadata                                |  12 +-
 122 files changed, 6364 insertions(+), 2562 deletions(-)
 create mode 100644 proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentName.java
 create mode 100644 proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutoApproveSmartMessagingEntriesResponse.java
 create mode 100644 proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutoApproveSmartMessagingEntriesResponseOrBuilder.java
 create mode 100644 proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/LocationName.java

diff --git a/google-cloud-dialogflow-bom/pom.xml b/google-cloud-dialogflow-bom/pom.xml
index fa0c52ee9..45cc78ae0 100644
--- a/google-cloud-dialogflow-bom/pom.xml
+++ b/google-cloud-dialogflow-bom/pom.xml
@@ -11,7 +11,7 @@
     <version>0.9.2</version>
   </parent>
 
-  <name>Google Cloud dialogflow BOM</name>
+  <name>Google Cloud Dialogflow BOM</name>
   <url>https://github.com/googleapis/java-dialogflow</url>
   <description>
     BOM for Google Cloud Dialog Flow API
diff --git a/google-cloud-dialogflow/clirr-ignored-differences.xml b/google-cloud-dialogflow/clirr-ignored-differences.xml
index 736dcbc07..cd253e332 100644
--- a/google-cloud-dialogflow/clirr-ignored-differences.xml
+++ b/google-cloud-dialogflow/clirr-ignored-differences.xml
@@ -1,23 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
 <differences>
-  <!-- TODO: remove after 2.1.0 is released -->
+  <!-- TODO: remove after 2.2.0 is released -->
   <difference>
-    <differenceType>7006</differenceType>
-    <className>com/google/cloud/dialogflow/v2beta1/EnvironmentsClient</className>
-    <method>com.google.cloud.dialogflow.v2beta1.ListEnvironmentsResponse listEnvironments(com.google.cloud.dialogflow.v2beta1.ListEnvironmentsRequest)</method>
-    <to>com.google.cloud.dialogflow.v2beta1.EnvironmentsClient$ListEnvironmentsPagedResponse</to>
+    <differenceType>7002</differenceType>
+    <className>com/google/cloud/dialogflow/v2beta1/DocumentsClient</className>
+    <method>com.google.longrunning.Operation reloadDocument(com.google.cloud.dialogflow.v2beta1.ReloadDocumentRequest)</method>
   </difference>
   <difference>
-    <differenceType>7006</differenceType>
-    <className>com/google/cloud/dialogflow/v2beta1/EnvironmentsSettings*</className>
-    <method>com.google.api.gax.rpc.UnaryCallSettings* listEnvironmentsSettings()</method>
-    <to>com.google.api.gax.rpc.PagedCallSettings*</to>
-  </difference>
-  <difference>
-    <differenceType>7006</differenceType>
-    <className>com/google/cloud/dialogflow/v2beta1/stub/EnvironmentsStubSettings*</className>
-    <method>com.google.api.gax.rpc.UnaryCallSettings* listEnvironmentsSettings()</method>
-    <to>com.google.api.gax.rpc.PagedCallSettings*</to>
+    <differenceType>7005</differenceType>
+    <className>com/google/cloud/dialogflow/v2beta1/*Client</className>
+    <method>* *(com.google.cloud.dialogflow.v2beta1.ProjectAgentName*)</method>
+    <to>* *(com.google.cloud.dialogflow.v2beta1.AgentName*)</to>
   </difference>
 </differences>
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsClient.java
index b7cc619aa..aabc1e6d5 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/ContextsClient.java
@@ -37,21 +37,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND SERVICE
 /**
- * Service Description: A context represents additional information included with user input or with
- * an intent returned by the Dialogflow API. Contexts are helpful for differentiating user input
- * which may be vague or have a different meaning depending on additional details from your
- * application such as user setting and preferences, previous user input, where the user is in your
- * application, geographic location, and so on.
- *
- * <p>You can include contexts as input parameters of a
- * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
- * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) request, or
- * as output contexts included in the returned intent. Contexts expire when an intent is matched,
- * after the number of `DetectIntent` requests specified by the `lifespan_count` parameter, or after
- * 20 minutes if no intents are matched for a `DetectIntent` request.
- *
- * <p>For more information about contexts, see the [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/contexts-overview).
+ * Service Description: Service for managing [Contexts][google.cloud.dialogflow.v2.Context].
  *
  * <p>This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java
index fe03e7402..5b75fa18a 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesClient.java
@@ -41,31 +41,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND SERVICE
 /**
- * Service Description: Entities are extracted from user input and represent parameters that are
- * meaningful to your application. For example, a date range, a proper name such as a geographic
- * location or landmark, and so on. Entities represent actionable data for your application.
- *
- * <p>When you define an entity, you can also include synonyms that all map to that entity. For
- * example, "soft drink", "soda", "pop", and so on.
- *
- * <p>There are three types of entities:
- *
- * <p>&#42; &#42;&#42;System&#42;&#42; - entities that are defined by the Dialogflow API for common
- * data types such as date, time, currency, and so on. A system entity is represented by the
- * `EntityType` type.
- *
- * <p>&#42; &#42;&#42;Custom&#42;&#42; - entities that are defined by you that represent actionable
- * data that is meaningful to your application. For example, you could define a `pizza.sauce` entity
- * for red or white pizza sauce, a `pizza.cheese` entity for the different types of cheese on a
- * pizza, a `pizza.topping` entity for different toppings, and so on. A custom entity is represented
- * by the `EntityType` type.
- *
- * <p>&#42; &#42;&#42;User&#42;&#42; - entities that are built for an individual user such as
- * favorites, preferences, playlists, and so on. A user entity is represented by the
- * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] type.
- *
- * <p>For more information about entity types, see the [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+ * Service Description: Service for managing [EntityTypes][google.cloud.dialogflow.v2.EntityType].
  *
  * <p>This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentsClient.java
index bdca42bb4..f00c90335 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentsClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentsClient.java
@@ -35,7 +35,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND SERVICE
 /**
- * Service Description: Manages agent environments.
+ * Service Description: Service for managing [Environments][google.cloud.dialogflow.v2.Environment].
  *
  * <p>This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java
index 83ee24706..a67c7bbea 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/IntentsClient.java
@@ -42,33 +42,7 @@
 
 // AUTO-GENERATED DOCUMENTATION AND SERVICE
 /**
- * Service Description: An intent represents a mapping between input from a user and an action to be
- * taken by your application. When you pass user input to the
- * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
- * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method, the
- * Dialogflow API analyzes the input and searches for a matching intent. If no match is found, the
- * Dialogflow API returns a fallback intent (`is_fallback` = true).
- *
- * <p>You can provide additional information for the Dialogflow API to use to match user input to an
- * intent by adding the following to your intent.
- *
- * <p>&#42; &#42;&#42;Contexts&#42;&#42; - provide additional context for intent analysis. For
- * example, if an intent is related to an object in your application that plays music, you can
- * provide a context to determine when to match the intent if the user input is "turn it off". You
- * can include a context that matches the intent when there is previous user input of "play music",
- * and not when there is previous user input of "turn on the light".
- *
- * <p>&#42; &#42;&#42;Events&#42;&#42; - allow for matching an intent by using an event name instead
- * of user input. Your application can provide an event name and related parameters to the
- * Dialogflow API to match an intent. For example, when your application starts, you can send a
- * welcome event with a user name parameter to the Dialogflow API to match an intent with a
- * personalized welcome message for the user.
- *
- * <p>&#42; &#42;&#42;Training phrases&#42;&#42; - provide examples of user input to train the
- * Dialogflow API agent to better match intents.
- *
- * <p>For more information about intents, see the [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/intents-overview).
+ * Service Description: Service for managing [Intents][google.cloud.dialogflow.v2.Intent].
  *
  * <p>This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClient.java
index 789ff6971..b31d60315 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesClient.java
@@ -37,19 +37,8 @@
 
 // AUTO-GENERATED DOCUMENTATION AND SERVICE
 /**
- * Service Description: Entities are extracted from user input and represent parameters that are
- * meaningful to your application. For example, a date range, a proper name such as a geographic
- * location or landmark, and so on. Entities represent actionable data for your application.
- *
- * <p>Session entity types are referred to as &#42;&#42;User&#42;&#42; entity types and are entities
- * that are built for an individual user such as favorites, preferences, playlists, and so on. You
- * can redefine a session entity type at the session level.
- *
- * <p>Session entity methods do not work with Google Assistant integration. Contact Dialogflow
- * support if you need to use session entities with Google Assistant integration.
- *
- * <p>For more information about entity types, see the [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+ * Service Description: Service for managing
+ * [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
  *
  * <p>This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java
index c8ae361f8..f30e54bbb 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/SessionsClient.java
@@ -27,10 +27,10 @@
 
 // AUTO-GENERATED DOCUMENTATION AND SERVICE
 /**
- * Service Description: A session represents an interaction with a user. You retrieve user input and
- * pass it to the [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
- * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method to
- * determine user intent and respond.
+ * Service Description: A service used for session interactions.
+ *
+ * <p>For more information, see the [API interactions
+ * guide](https://cloud.google.com/dialogflow/docs/api-overview).
  *
  * <p>This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
@@ -171,6 +171,8 @@ public SessionsStub getStub() {
    *     appropriate `Session ID` and `User Id`. They can be a random number or some type of user
    *     and session identifiers (preferably hashed). The length of the `Session ID` and `User ID`
    *     must not exceed 36 characters.
+   *     <p>For more information, see the [API interactions
+   *     guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * @param queryInput Required. The input specification. It can be set to:
    *     <p>1. an audio config which instructs the speech recognizer how to process the speech
    *     audio,
@@ -211,6 +213,8 @@ public final DetectIntentResponse detectIntent(SessionName session, QueryInput q
    *     appropriate `Session ID` and `User Id`. They can be a random number or some type of user
    *     and session identifiers (preferably hashed). The length of the `Session ID` and `User ID`
    *     must not exceed 36 characters.
+   *     <p>For more information, see the [API interactions
+   *     guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * @param queryInput Required. The input specification. It can be set to:
    *     <p>1. an audio config which instructs the speech recognizer how to process the speech
    *     audio,
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java
index 6990f2010..faf5e7f6c 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java
@@ -36,21 +36,7 @@
  *
  * ============== ContextsClient ==============
  *
- * <p>Service Description: A context represents additional information included with user input or
- * with an intent returned by the Dialogflow API. Contexts are helpful for differentiating user
- * input which may be vague or have a different meaning depending on additional details from your
- * application such as user setting and preferences, previous user input, where the user is in your
- * application, geographic location, and so on.
- *
- * <p>You can include contexts as input parameters of a
- * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
- * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) request, or
- * as output contexts included in the returned intent. Contexts expire when an intent is matched,
- * after the number of `DetectIntent` requests specified by the `lifespan_count` parameter, or after
- * 20 minutes if no intents are matched for a `DetectIntent` request.
- *
- * <p>For more information about contexts, see the [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/contexts-overview).
+ * <p>Service Description: Service for managing [Contexts][google.cloud.dialogflow.v2.Context].
  *
  * <p>Sample for ContextsClient:
  *
@@ -65,31 +51,8 @@
  *
  * ================= EntityTypesClient =================
  *
- * <p>Service Description: Entities are extracted from user input and represent parameters that are
- * meaningful to your application. For example, a date range, a proper name such as a geographic
- * location or landmark, and so on. Entities represent actionable data for your application.
- *
- * <p>When you define an entity, you can also include synonyms that all map to that entity. For
- * example, "soft drink", "soda", "pop", and so on.
- *
- * <p>There are three types of entities:
- *
- * <p>&#42; &#42;&#42;System&#42;&#42; - entities that are defined by the Dialogflow API for common
- * data types such as date, time, currency, and so on. A system entity is represented by the
- * `EntityType` type.
- *
- * <p>&#42; &#42;&#42;Custom&#42;&#42; - entities that are defined by you that represent actionable
- * data that is meaningful to your application. For example, you could define a `pizza.sauce` entity
- * for red or white pizza sauce, a `pizza.cheese` entity for the different types of cheese on a
- * pizza, a `pizza.topping` entity for different toppings, and so on. A custom entity is represented
- * by the `EntityType` type.
- *
- * <p>&#42; &#42;&#42;User&#42;&#42; - entities that are built for an individual user such as
- * favorites, preferences, playlists, and so on. A user entity is represented by the
- * [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] type.
- *
- * <p>For more information about entity types, see the [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+ * <p>Service Description: Service for managing
+ * [EntityTypes][google.cloud.dialogflow.v2.EntityType].
  *
  * <p>Sample for EntityTypesClient:
  *
@@ -104,7 +67,8 @@
  *
  * ================== EnvironmentsClient ==================
  *
- * <p>Service Description: Manages agent environments.
+ * <p>Service Description: Service for managing
+ * [Environments][google.cloud.dialogflow.v2.Environment].
  *
  * <p>Sample for EnvironmentsClient:
  *
@@ -122,33 +86,7 @@
  *
  * ============= IntentsClient =============
  *
- * <p>Service Description: An intent represents a mapping between input from a user and an action to
- * be taken by your application. When you pass user input to the
- * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
- * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method, the
- * Dialogflow API analyzes the input and searches for a matching intent. If no match is found, the
- * Dialogflow API returns a fallback intent (`is_fallback` = true).
- *
- * <p>You can provide additional information for the Dialogflow API to use to match user input to an
- * intent by adding the following to your intent.
- *
- * <p>&#42; &#42;&#42;Contexts&#42;&#42; - provide additional context for intent analysis. For
- * example, if an intent is related to an object in your application that plays music, you can
- * provide a context to determine when to match the intent if the user input is "turn it off". You
- * can include a context that matches the intent when there is previous user input of "play music",
- * and not when there is previous user input of "turn on the light".
- *
- * <p>&#42; &#42;&#42;Events&#42;&#42; - allow for matching an intent by using an event name instead
- * of user input. Your application can provide an event name and related parameters to the
- * Dialogflow API to match an intent. For example, when your application starts, you can send a
- * welcome event with a user name parameter to the Dialogflow API to match an intent with a
- * personalized welcome message for the user.
- *
- * <p>&#42; &#42;&#42;Training phrases&#42;&#42; - provide examples of user input to train the
- * Dialogflow API agent to better match intents.
- *
- * <p>For more information about intents, see the [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/intents-overview).
+ * <p>Service Description: Service for managing [Intents][google.cloud.dialogflow.v2.Intent].
  *
  * <p>Sample for IntentsClient:
  *
@@ -163,19 +101,8 @@
  *
  * ======================== SessionEntityTypesClient ========================
  *
- * <p>Service Description: Entities are extracted from user input and represent parameters that are
- * meaningful to your application. For example, a date range, a proper name such as a geographic
- * location or landmark, and so on. Entities represent actionable data for your application.
- *
- * <p>Session entity types are referred to as &#42;&#42;User&#42;&#42; entity types and are entities
- * that are built for an individual user such as favorites, preferences, playlists, and so on. You
- * can redefine a session entity type at the session level.
- *
- * <p>Session entity methods do not work with Google Assistant integration. Contact Dialogflow
- * support if you need to use session entities with Google Assistant integration.
- *
- * <p>For more information about entity types, see the [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+ * <p>Service Description: Service for managing
+ * [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
  *
  * <p>Sample for SessionEntityTypesClient:
  *
@@ -190,10 +117,10 @@
  *
  * ============== SessionsClient ==============
  *
- * <p>Service Description: A session represents an interaction with a user. You retrieve user input
- * and pass it to the [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
- * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method to
- * determine user intent and respond.
+ * <p>Service Description: A service used for session interactions.
+ *
+ * <p>For more information, see the [API interactions
+ * guide](https://cloud.google.com/dialogflow/docs/api-overview).
  *
  * <p>Sample for SessionsClient:
  *
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
index 00fc8b84e..2d6c6771e 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
@@ -49,8 +49,8 @@
  * <pre>
  * <code>
  * try (AgentsClient agentsClient = AgentsClient.create()) {
- *   Agent agent = Agent.newBuilder().build();
- *   Agent response = agentsClient.setAgent(agent);
+ *   ProjectName parent = ProjectName.of("[PROJECT]");
+ *   Agent response = agentsClient.getAgent(parent);
  * }
  * </code>
  * </pre>
@@ -170,6 +170,119 @@ public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Retrieves the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   Agent response = agentsClient.getAgent(parent);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The project that the agent to fetch is associated with. Format:
+   *     `projects/&lt;Project ID&gt;`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Agent getAgent(ProjectName parent) {
+    GetAgentRequest request =
+        GetAgentRequest.newBuilder().setParent(parent == null ? null : parent.toString()).build();
+    return getAgent(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Retrieves the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   Agent response = agentsClient.getAgent(parent);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The project that the agent to fetch is associated with. Format:
+   *     `projects/&lt;Project ID&gt;`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Agent getAgent(LocationName parent) {
+    GetAgentRequest request =
+        GetAgentRequest.newBuilder().setParent(parent == null ? null : parent.toString()).build();
+    return getAgent(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Retrieves the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   Agent response = agentsClient.getAgent(parent.toString());
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The project that the agent to fetch is associated with. Format:
+   *     `projects/&lt;Project ID&gt;`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Agent getAgent(String parent) {
+    GetAgentRequest request = GetAgentRequest.newBuilder().setParent(parent).build();
+    return getAgent(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Retrieves the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   GetAgentRequest request = GetAgentRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   Agent response = agentsClient.getAgent(request);
+   * }
+   * </code></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 Agent getAgent(GetAgentRequest request) {
+    return getAgentCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Retrieves the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   GetAgentRequest request = GetAgentRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   ApiFuture&lt;Agent&gt; future = agentsClient.getAgentCallable().futureCall(request);
+   *   // Do something
+   *   Agent response = future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
+    return stub.getAgentCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Creates/updates the specified agent.
@@ -261,6 +374,31 @@ public final void deleteAgent(ProjectName parent) {
     deleteAgent(request);
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   agentsClient.deleteAgent(parent);
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The project that the agent to delete is associated with. Format:
+   *     `projects/&lt;Project ID&gt;`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteAgent(LocationName parent) {
+    DeleteAgentRequest request =
+        DeleteAgentRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
+    deleteAgent(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Deletes the specified agent.
@@ -330,92 +468,32 @@ public final UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Retrieves the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
-   *   Agent response = agentsClient.getAgent(parent);
-   * }
-   * </code></pre>
-   *
-   * @param parent Required. The project that the agent to fetch is associated with. Format:
-   *     `projects/&lt;Project ID&gt;`.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final Agent getAgent(ProjectName parent) {
-    GetAgentRequest request =
-        GetAgentRequest.newBuilder().setParent(parent == null ? null : parent.toString()).build();
-    return getAgent(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Retrieves the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
-   *   Agent response = agentsClient.getAgent(parent.toString());
-   * }
-   * </code></pre>
-   *
-   * @param parent Required. The project that the agent to fetch is associated with. Format:
-   *     `projects/&lt;Project ID&gt;`.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final Agent getAgent(String parent) {
-    GetAgentRequest request = GetAgentRequest.newBuilder().setParent(parent).build();
-    return getAgent(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Retrieves the specified agent.
+   * Returns the list of agents. Since there is at most one conversational agent per project, this
+   * method is useful primarily for listing all agents across projects the caller has access to. One
+   * can achieve that with a wildcard project collection id "-". Refer to [List
+   * Sub-Collections](https://cloud.google.com/apis/design/design_patterns#list_sub-collections).
    *
    * <p>Sample code:
    *
    * <pre><code>
    * try (AgentsClient agentsClient = AgentsClient.create()) {
    *   ProjectName parent = ProjectName.of("[PROJECT]");
-   *   GetAgentRequest request = GetAgentRequest.newBuilder()
-   *     .setParent(parent.toString())
-   *     .build();
-   *   Agent response = agentsClient.getAgent(request);
+   *   for (Agent element : agentsClient.searchAgents(parent).iterateAll()) {
+   *     // doThingsWith(element);
+   *   }
    * }
    * </code></pre>
    *
-   * @param request The request object containing all of the parameters for the API call.
+   * @param parent Required. The project to list agents from. Format: `projects/&lt;Project ID or
+   *     '-'&gt;`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Agent getAgent(GetAgentRequest request) {
-    return getAgentCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Retrieves the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
-   *   GetAgentRequest request = GetAgentRequest.newBuilder()
-   *     .setParent(parent.toString())
-   *     .build();
-   *   ApiFuture&lt;Agent&gt; future = agentsClient.getAgentCallable().futureCall(request);
-   *   // Do something
-   *   Agent response = future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
-    return stub.getAgentCallable();
+  public final SearchAgentsPagedResponse searchAgents(ProjectName parent) {
+    SearchAgentsRequest request =
+        SearchAgentsRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
+    return searchAgents(request);
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -429,7 +507,7 @@ public final UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
    *
    * <pre><code>
    * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
    *   for (Agent element : agentsClient.searchAgents(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -440,7 +518,7 @@ public final UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
    *     '-'&gt;`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final SearchAgentsPagedResponse searchAgents(ProjectName parent) {
+  public final SearchAgentsPagedResponse searchAgents(LocationName parent) {
     SearchAgentsRequest request =
         SearchAgentsRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -592,6 +670,33 @@ public final OperationFuture<Empty, Struct> trainAgentAsync(ProjectName parent)
     return trainAgentAsync(request);
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Trains the specified agent.
+   *
+   * <p>Operation &lt;response: [google.protobuf.Empty][google.protobuf.Empty]&gt;
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   agentsClient.trainAgentAsync(parent).get();
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The project that the agent to train is associated with. Format:
+   *     `projects/&lt;Project ID&gt;`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  public final OperationFuture<Empty, Struct> trainAgentAsync(LocationName parent) {
+    TrainAgentRequest request =
+        TrainAgentRequest.newBuilder().setParent(parent == null ? null : parent.toString()).build();
+    return trainAgentAsync(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Trains the specified agent.
@@ -724,6 +829,36 @@ public final OperationFuture<ExportAgentResponse, Struct> exportAgentAsync(Proje
     return exportAgentAsync(request);
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Exports the specified agent to a ZIP file.
+   *
+   * <p>Operation &lt;response:
+   * [ExportAgentResponse][google.cloud.dialogflow.v2beta1.ExportAgentResponse]&gt;
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   LocationName parent = LocationName.of("[PROJECT]", "[LOCATION]");
+   *   ExportAgentResponse response = agentsClient.exportAgentAsync(parent).get();
+   * }
+   * </code></pre>
+   *
+   * @param parent Required. The project that the agent to export is associated with. Format:
+   *     `projects/&lt;Project ID&gt;`.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  public final OperationFuture<ExportAgentResponse, Struct> exportAgentAsync(LocationName parent) {
+    ExportAgentRequest request =
+        ExportAgentRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
+    return exportAgentAsync(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Exports the specified agent to a ZIP file.
@@ -1051,7 +1186,10 @@ public final UnaryCallable<RestoreAgentRequest, Operation> restoreAgentCallable(
    *
    * <pre><code>
    * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   GetValidationResultRequest request = GetValidationResultRequest.newBuilder().build();
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   GetValidationResultRequest request = GetValidationResultRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
    *   ValidationResult response = agentsClient.getValidationResult(request);
    * }
    * </code></pre>
@@ -1072,7 +1210,10 @@ public final ValidationResult getValidationResult(GetValidationResultRequest req
    *
    * <pre><code>
    * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   GetValidationResultRequest request = GetValidationResultRequest.newBuilder().build();
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   GetValidationResultRequest request = GetValidationResultRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
    *   ApiFuture&lt;ValidationResult&gt; future = agentsClient.getValidationResultCallable().futureCall(request);
    *   // Do something
    *   ValidationResult response = future.get();
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
index 31787275a..346ec03aa 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
@@ -52,16 +52,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of setAgent to 30 seconds:
+ * <p>For example, to set the total timeout of getAgent to 30 seconds:
  *
  * <pre>
  * <code>
  * AgentsSettings.Builder agentsSettingsBuilder =
  *     AgentsSettings.newBuilder();
  * agentsSettingsBuilder
- *     .setAgentSettings()
+ *     .getAgentSettings()
  *     .setRetrySettings(
- *         agentsSettingsBuilder.setAgentSettings().getRetrySettings().toBuilder()
+ *         agentsSettingsBuilder.getAgentSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * AgentsSettings agentsSettings = agentsSettingsBuilder.build();
@@ -71,6 +71,11 @@
 @Generated("by gapic-generator")
 @BetaApi
 public class AgentsSettings extends ClientSettings<AgentsSettings> {
+  /** Returns the object with the settings used for calls to getAgent. */
+  public UnaryCallSettings<GetAgentRequest, Agent> getAgentSettings() {
+    return ((AgentsStubSettings) getStubSettings()).getAgentSettings();
+  }
+
   /** Returns the object with the settings used for calls to setAgent. */
   public UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings() {
     return ((AgentsStubSettings) getStubSettings()).setAgentSettings();
@@ -81,11 +86,6 @@ public UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings() {
     return ((AgentsStubSettings) getStubSettings()).deleteAgentSettings();
   }
 
-  /** Returns the object with the settings used for calls to getAgent. */
-  public UnaryCallSettings<GetAgentRequest, Agent> getAgentSettings() {
-    return ((AgentsStubSettings) getStubSettings()).getAgentSettings();
-  }
-
   /** Returns the object with the settings used for calls to searchAgents. */
   public PagedCallSettings<SearchAgentsRequest, SearchAgentsResponse, SearchAgentsPagedResponse>
       searchAgentsSettings() {
@@ -243,6 +243,11 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
+    /** Returns the builder for the settings used for calls to getAgent. */
+    public UnaryCallSettings.Builder<GetAgentRequest, Agent> getAgentSettings() {
+      return getStubSettingsBuilder().getAgentSettings();
+    }
+
     /** Returns the builder for the settings used for calls to setAgent. */
     public UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings() {
       return getStubSettingsBuilder().setAgentSettings();
@@ -253,11 +258,6 @@ public UnaryCallSettings.Builder<DeleteAgentRequest, Empty> deleteAgentSettings(
       return getStubSettingsBuilder().deleteAgentSettings();
     }
 
-    /** Returns the builder for the settings used for calls to getAgent. */
-    public UnaryCallSettings.Builder<GetAgentRequest, Agent> getAgentSettings() {
-      return getStubSettingsBuilder().getAgentSettings();
-    }
-
     /** Returns the builder for the settings used for calls to searchAgents. */
     public PagedCallSettings.Builder<
             SearchAgentsRequest, SearchAgentsResponse, SearchAgentsPagedResponse>
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java
index 2c0709ba1..d9e76fe4f 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextsClient.java
@@ -29,6 +29,7 @@
 import com.google.cloud.dialogflow.v2beta1.stub.ContextsStubSettings;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -44,7 +45,7 @@
  * <pre>
  * <code>
  * try (ContextsClient contextsClient = ContextsClient.create()) {
- *   ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+ *   ContextName name = ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
  *   Context response = contextsClient.getContext(name);
  * }
  * </code>
@@ -160,7 +161,7 @@ public ContextsStub getStub() {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   for (Context element : contextsClient.listContexts(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -190,7 +191,7 @@ public final ListContextsPagedResponse listContexts(SessionName parent) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   for (Context element : contextsClient.listContexts(parent.toString()).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -217,7 +218,7 @@ public final ListContextsPagedResponse listContexts(String parent) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   ListContextsRequest request = ListContextsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -242,7 +243,7 @@ public final ListContextsPagedResponse listContexts(ListContextsRequest request)
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   ListContextsRequest request = ListContextsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -267,7 +268,7 @@ public final ListContextsPagedResponse listContexts(ListContextsRequest request)
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   ListContextsRequest request = ListContextsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -298,7 +299,7 @@ public final UnaryCallable<ListContextsRequest, ListContextsResponse> listContex
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+   *   ContextName name = ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
    *   Context response = contextsClient.getContext(name);
    * }
    * </code></pre>
@@ -325,7 +326,7 @@ public final Context getContext(ContextName name) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+   *   ContextName name = ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
    *   Context response = contextsClient.getContext(name.toString());
    * }
    * </code></pre>
@@ -351,7 +352,7 @@ public final Context getContext(String name) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+   *   ContextName name = ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
    *   GetContextRequest request = GetContextRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -374,7 +375,7 @@ public final Context getContext(GetContextRequest request) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+   *   ContextName name = ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
    *   GetContextRequest request = GetContextRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -398,7 +399,7 @@ public final UnaryCallable<GetContextRequest, Context> getContextCallable() {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   Context context = Context.newBuilder().build();
    *   Context response = contextsClient.createContext(parent, context);
    * }
@@ -431,7 +432,7 @@ public final Context createContext(SessionName parent, Context context) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   Context context = Context.newBuilder().build();
    *   Context response = contextsClient.createContext(parent.toString(), context);
    * }
@@ -461,7 +462,7 @@ public final Context createContext(String parent, Context context) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   Context context = Context.newBuilder().build();
    *   CreateContextRequest request = CreateContextRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -488,7 +489,7 @@ public final Context createContext(CreateContextRequest request) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   Context context = Context.newBuilder().build();
    *   CreateContextRequest request = CreateContextRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -504,6 +505,30 @@ public final UnaryCallable<CreateContextRequest, Context> createContextCallable(
     return stub.createContextCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates the specified context.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (ContextsClient contextsClient = ContextsClient.create()) {
+   *   Context context = Context.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   Context response = contextsClient.updateContext(context, updateMask);
+   * }
+   * </code></pre>
+   *
+   * @param context Required. The context to update.
+   * @param updateMask Optional. The mask to control which fields get updated.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Context updateContext(Context context, FieldMask updateMask) {
+    UpdateContextRequest request =
+        UpdateContextRequest.newBuilder().setContext(context).setUpdateMask(updateMask).build();
+    return updateContext(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Updates the specified context.
@@ -578,7 +603,7 @@ public final UnaryCallable<UpdateContextRequest, Context> updateContextCallable(
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+   *   ContextName name = ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
    *   contextsClient.deleteContext(name);
    * }
    * </code></pre>
@@ -605,7 +630,7 @@ public final void deleteContext(ContextName name) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+   *   ContextName name = ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
    *   contextsClient.deleteContext(name.toString());
    * }
    * </code></pre>
@@ -631,7 +656,7 @@ public final void deleteContext(String name) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+   *   ContextName name = ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
    *   DeleteContextRequest request = DeleteContextRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -654,7 +679,7 @@ public final void deleteContext(DeleteContextRequest request) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+   *   ContextName name = ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
    *   DeleteContextRequest request = DeleteContextRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -676,7 +701,7 @@ public final UnaryCallable<DeleteContextRequest, Empty> deleteContextCallable()
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   contextsClient.deleteAllContexts(parent);
    * }
    * </code></pre>
@@ -704,7 +729,7 @@ public final void deleteAllContexts(SessionName parent) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   contextsClient.deleteAllContexts(parent.toString());
    * }
    * </code></pre>
@@ -730,7 +755,7 @@ public final void deleteAllContexts(String parent) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   DeleteAllContextsRequest request = DeleteAllContextsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -753,7 +778,7 @@ public final void deleteAllContexts(DeleteAllContextsRequest request) {
    *
    * <pre><code>
    * try (ContextsClient contextsClient = ContextsClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   DeleteAllContextsRequest request = DeleteAllContextsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentsClient.java
index 447ba4061..719f88c0d 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentsClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentsClient.java
@@ -33,6 +33,7 @@
 import com.google.longrunning.Operation;
 import com.google.longrunning.OperationsClient;
 import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -708,6 +709,37 @@ public final UnaryCallable<DeleteDocumentRequest, Operation> deleteDocumentCalla
     return stub.deleteDocumentCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates the specified document.
+   *
+   * <p>Note: The `projects.agent.knowledgeBases.documents` resource is deprecated; only use
+   * `projects.knowledgeBases.documents`.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DocumentsClient documentsClient = DocumentsClient.create()) {
+   *   Document document = Document.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   Document response = documentsClient.updateDocumentAsync(document, updateMask).get();
+   * }
+   * </code></pre>
+   *
+   * @param document Required. The document to update.
+   * @param updateMask Optional. Not specified means `update all`. Currently, only `display_name`
+   *     can be updated, an InvalidArgument will be returned for attempting to update other fields.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  public final OperationFuture<Document, KnowledgeOperationMetadata> updateDocumentAsync(
+      Document document, FieldMask updateMask) {
+    UpdateDocumentRequest request =
+        UpdateDocumentRequest.newBuilder().setDocument(document).setUpdateMask(updateMask).build();
+    return updateDocumentAsync(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Updates the specified document.
@@ -831,16 +863,52 @@ public final UnaryCallable<UpdateDocumentRequest, Operation> updateDocumentCalla
    *
    * <pre><code>
    * try (DocumentsClient documentsClient = DocumentsClient.create()) {
-   *   ReloadDocumentRequest request = ReloadDocumentRequest.newBuilder().build();
-   *   Operation response = documentsClient.reloadDocument(request);
+   *   DocumentName name = DocumentName.of("[PROJECT]", "[KNOWLEDGE_BASE]", "[DOCUMENT]");
+   *   ReloadDocumentRequest request = ReloadDocumentRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   Document response = documentsClient.reloadDocumentAsync(request).get();
    * }
    * </code></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 Operation reloadDocument(ReloadDocumentRequest request) {
-    return reloadDocumentCallable().call(request);
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  public final OperationFuture<Document, KnowledgeOperationMetadata> reloadDocumentAsync(
+      ReloadDocumentRequest request) {
+    return reloadDocumentOperationCallable().futureCall(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Reloads the specified document from its specified source, content_uri or content. The
+   * previously loaded content of the document will be deleted. Note: Even when the content of the
+   * document has not changed, there still may be side effects because of internal implementation
+   * changes.
+   *
+   * <p>Note: The `projects.agent.knowledgeBases.documents` resource is deprecated; only use
+   * `projects.knowledgeBases.documents`.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (DocumentsClient documentsClient = DocumentsClient.create()) {
+   *   DocumentName name = DocumentName.of("[PROJECT]", "[KNOWLEDGE_BASE]", "[DOCUMENT]");
+   *   ReloadDocumentRequest request = ReloadDocumentRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   OperationFuture&lt;Document, KnowledgeOperationMetadata&gt; future = documentsClient.reloadDocumentOperationCallable().futureCall(request);
+   *   // Do something
+   *   Document response = future.get();
+   * }
+   * </code></pre>
+   */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+  public final OperationCallable<ReloadDocumentRequest, Document, KnowledgeOperationMetadata>
+      reloadDocumentOperationCallable() {
+    return stub.reloadDocumentOperationCallable();
   }
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
@@ -857,7 +925,10 @@ public final Operation reloadDocument(ReloadDocumentRequest request) {
    *
    * <pre><code>
    * try (DocumentsClient documentsClient = DocumentsClient.create()) {
-   *   ReloadDocumentRequest request = ReloadDocumentRequest.newBuilder().build();
+   *   DocumentName name = DocumentName.of("[PROJECT]", "[KNOWLEDGE_BASE]", "[DOCUMENT]");
+   *   ReloadDocumentRequest request = ReloadDocumentRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
    *   ApiFuture&lt;Operation&gt; future = documentsClient.reloadDocumentCallable().futureCall(request);
    *   // Do something
    *   Operation response = future.get();
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentsSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentsSettings.java
index 4bf9bd75d..6937e6ac4 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentsSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentsSettings.java
@@ -125,6 +125,14 @@ public UnaryCallSettings<ReloadDocumentRequest, Operation> reloadDocumentSetting
     return ((DocumentsStubSettings) getStubSettings()).reloadDocumentSettings();
   }
 
+  /** Returns the object with the settings used for calls to reloadDocument. */
+  @BetaApi(
+      "The surface for long-running operations is not stable yet and may change in the future.")
+  public OperationCallSettings<ReloadDocumentRequest, Document, KnowledgeOperationMetadata>
+      reloadDocumentOperationSettings() {
+    return ((DocumentsStubSettings) getStubSettings()).reloadDocumentOperationSettings();
+  }
+
   public static final DocumentsSettings create(DocumentsStubSettings stub) throws IOException {
     return new DocumentsSettings.Builder(stub.toBuilder()).build();
   }
@@ -279,6 +287,15 @@ public UnaryCallSettings.Builder<ReloadDocumentRequest, Operation> reloadDocumen
       return getStubSettingsBuilder().reloadDocumentSettings();
     }
 
+    /** Returns the builder for the settings used for calls to reloadDocument. */
+    @BetaApi(
+        "The surface for long-running operations is not stable yet and may change in the future.")
+    public OperationCallSettings.Builder<
+            ReloadDocumentRequest, Document, KnowledgeOperationMetadata>
+        reloadDocumentOperationSettings() {
+      return getStubSettingsBuilder().reloadDocumentOperationSettings();
+    }
+
     @Override
     public DocumentsSettings build() throws IOException {
       return new DocumentsSettings(this);
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java
index e64295b41..36070d639 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClient.java
@@ -33,6 +33,7 @@
 import com.google.longrunning.Operation;
 import com.google.longrunning.OperationsClient;
 import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
 import com.google.protobuf.Struct;
 import java.io.IOException;
 import java.util.List;
@@ -50,7 +51,7 @@
  * <pre>
  * <code>
  * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
- *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+ *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
  *   EntityType response = entityTypesClient.getEntityType(name);
  * }
  * </code>
@@ -180,7 +181,7 @@ public final OperationsClient getOperationsClient() {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   for (EntityType element : entityTypesClient.listEntityTypes(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -191,7 +192,7 @@ public final OperationsClient getOperationsClient() {
    *     ID&gt;/agent`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListEntityTypesPagedResponse listEntityTypes(ProjectAgentName parent) {
+  public final ListEntityTypesPagedResponse listEntityTypes(AgentName parent) {
     ListEntityTypesRequest request =
         ListEntityTypesRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -207,7 +208,7 @@ public final ListEntityTypesPagedResponse listEntityTypes(ProjectAgentName paren
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   for (EntityType element : entityTypesClient.listEntityTypes(parent.toString()).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -231,7 +232,7 @@ public final ListEntityTypesPagedResponse listEntityTypes(String parent) {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   String languageCode = "";
    *   for (EntityType element : entityTypesClient.listEntityTypes(parent, languageCode).iterateAll()) {
    *     // doThingsWith(element);
@@ -247,8 +248,7 @@ public final ListEntityTypesPagedResponse listEntityTypes(String parent) {
    *     data](https://cloud.google.com/dialogflow/docs/agents-multilingual#intent-entity).
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListEntityTypesPagedResponse listEntityTypes(
-      ProjectAgentName parent, String languageCode) {
+  public final ListEntityTypesPagedResponse listEntityTypes(AgentName parent, String languageCode) {
     ListEntityTypesRequest request =
         ListEntityTypesRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -265,7 +265,7 @@ public final ListEntityTypesPagedResponse listEntityTypes(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   String languageCode = "";
    *   for (EntityType element : entityTypesClient.listEntityTypes(parent.toString(), languageCode).iterateAll()) {
    *     // doThingsWith(element);
@@ -295,7 +295,7 @@ public final ListEntityTypesPagedResponse listEntityTypes(String parent, String
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   ListEntityTypesRequest request = ListEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -320,7 +320,7 @@ public final ListEntityTypesPagedResponse listEntityTypes(ListEntityTypesRequest
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   ListEntityTypesRequest request = ListEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -345,7 +345,7 @@ public final ListEntityTypesPagedResponse listEntityTypes(ListEntityTypesRequest
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   ListEntityTypesRequest request = ListEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -377,7 +377,7 @@ public final ListEntityTypesPagedResponse listEntityTypes(ListEntityTypesRequest
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   EntityType response = entityTypesClient.getEntityType(name);
    * }
    * </code></pre>
@@ -400,7 +400,7 @@ public final EntityType getEntityType(EntityTypeName name) {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   EntityType response = entityTypesClient.getEntityType(name.toString());
    * }
    * </code></pre>
@@ -422,7 +422,7 @@ public final EntityType getEntityType(String name) {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   String languageCode = "";
    *   EntityType response = entityTypesClient.getEntityType(name, languageCode);
    * }
@@ -453,7 +453,7 @@ public final EntityType getEntityType(EntityTypeName name, String languageCode)
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   String languageCode = "";
    *   EntityType response = entityTypesClient.getEntityType(name.toString(), languageCode);
    * }
@@ -481,7 +481,7 @@ public final EntityType getEntityType(String name, String languageCode) {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   GetEntityTypeRequest request = GetEntityTypeRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -504,7 +504,7 @@ public final EntityType getEntityType(GetEntityTypeRequest request) {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   GetEntityTypeRequest request = GetEntityTypeRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -526,7 +526,7 @@ public final UnaryCallable<GetEntityTypeRequest, EntityType> getEntityTypeCallab
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   EntityType entityType = EntityType.newBuilder().build();
    *   EntityType response = entityTypesClient.createEntityType(parent, entityType);
    * }
@@ -537,7 +537,7 @@ public final UnaryCallable<GetEntityTypeRequest, EntityType> getEntityTypeCallab
    * @param entityType Required. The entity type to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final EntityType createEntityType(ProjectAgentName parent, EntityType entityType) {
+  public final EntityType createEntityType(AgentName parent, EntityType entityType) {
     CreateEntityTypeRequest request =
         CreateEntityTypeRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -554,7 +554,7 @@ public final EntityType createEntityType(ProjectAgentName parent, EntityType ent
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   EntityType entityType = EntityType.newBuilder().build();
    *   EntityType response = entityTypesClient.createEntityType(parent.toString(), entityType);
    * }
@@ -579,7 +579,7 @@ public final EntityType createEntityType(String parent, EntityType entityType) {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   EntityType entityType = EntityType.newBuilder().build();
    *   String languageCode = "";
    *   EntityType response = entityTypesClient.createEntityType(parent, entityType, languageCode);
@@ -596,7 +596,7 @@ public final EntityType createEntityType(String parent, EntityType entityType) {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final EntityType createEntityType(
-      ProjectAgentName parent, EntityType entityType, String languageCode) {
+      AgentName parent, EntityType entityType, String languageCode) {
     CreateEntityTypeRequest request =
         CreateEntityTypeRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -614,7 +614,7 @@ public final EntityType createEntityType(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   EntityType entityType = EntityType.newBuilder().build();
    *   String languageCode = "";
    *   EntityType response = entityTypesClient.createEntityType(parent.toString(), entityType, languageCode);
@@ -649,7 +649,7 @@ public final EntityType createEntityType(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   EntityType entityType = EntityType.newBuilder().build();
    *   CreateEntityTypeRequest request = CreateEntityTypeRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -674,7 +674,7 @@ public final EntityType createEntityType(CreateEntityTypeRequest request) {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   EntityType entityType = EntityType.newBuilder().build();
    *   CreateEntityTypeRequest request = CreateEntityTypeRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -742,6 +742,40 @@ public final EntityType updateEntityType(EntityType entityType, String languageC
     return updateEntityType(request);
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates the specified entity type.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
+   *   EntityType entityType = EntityType.newBuilder().build();
+   *   String languageCode = "";
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   EntityType response = entityTypesClient.updateEntityType(entityType, languageCode, updateMask);
+   * }
+   * </code></pre>
+   *
+   * @param entityType Required. The entity type to update.
+   * @param languageCode Optional. The language used to access language-specific data. If not
+   *     specified, the agent's default language is used. For more information, see [Multilingual
+   *     intent and entity
+   *     data](https://cloud.google.com/dialogflow/docs/agents-multilingual#intent-entity).
+   * @param updateMask Optional. The mask to control which fields get updated.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final EntityType updateEntityType(
+      EntityType entityType, String languageCode, FieldMask updateMask) {
+    UpdateEntityTypeRequest request =
+        UpdateEntityTypeRequest.newBuilder()
+            .setEntityType(entityType)
+            .setLanguageCode(languageCode)
+            .setUpdateMask(updateMask)
+            .build();
+    return updateEntityType(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Updates the specified entity type.
@@ -795,7 +829,7 @@ public final UnaryCallable<UpdateEntityTypeRequest, EntityType> updateEntityType
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   entityTypesClient.deleteEntityType(name);
    * }
    * </code></pre>
@@ -818,7 +852,7 @@ public final void deleteEntityType(EntityTypeName name) {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   entityTypesClient.deleteEntityType(name.toString());
    * }
    * </code></pre>
@@ -840,7 +874,7 @@ public final void deleteEntityType(String name) {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   DeleteEntityTypeRequest request = DeleteEntityTypeRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -863,7 +897,7 @@ public final void deleteEntityType(DeleteEntityTypeRequest request) {
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   DeleteEntityTypeRequest request = DeleteEntityTypeRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -886,7 +920,7 @@ public final UnaryCallable<DeleteEntityTypeRequest, Empty> deleteEntityTypeCalla
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   BatchUpdateEntityTypesRequest request = BatchUpdateEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -913,7 +947,7 @@ public final OperationFuture<BatchUpdateEntityTypesResponse, Struct> batchUpdate
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   BatchUpdateEntityTypesRequest request = BatchUpdateEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -939,7 +973,7 @@ public final OperationFuture<BatchUpdateEntityTypesResponse, Struct> batchUpdate
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   BatchUpdateEntityTypesRequest request = BatchUpdateEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -963,7 +997,7 @@ public final OperationFuture<BatchUpdateEntityTypesResponse, Struct> batchUpdate
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   List&lt;String&gt; entityTypeNames = new ArrayList&lt;&gt;();
    *   entityTypesClient.batchDeleteEntityTypesAsync(parent, entityTypeNames).get();
    * }
@@ -978,7 +1012,7 @@ public final OperationFuture<BatchUpdateEntityTypesResponse, Struct> batchUpdate
   @BetaApi(
       "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture<Empty, Struct> batchDeleteEntityTypesAsync(
-      ProjectAgentName parent, List<String> entityTypeNames) {
+      AgentName parent, List<String> entityTypeNames) {
     BatchDeleteEntityTypesRequest request =
         BatchDeleteEntityTypesRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -996,7 +1030,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntityTypesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   List&lt;String&gt; entityTypeNames = new ArrayList&lt;&gt;();
    *   entityTypesClient.batchDeleteEntityTypesAsync(parent.toString(), entityTypeNames).get();
    * }
@@ -1029,7 +1063,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntityTypesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   List&lt;String&gt; entityTypeNames = new ArrayList&lt;&gt;();
    *   BatchDeleteEntityTypesRequest request = BatchDeleteEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1058,7 +1092,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntityTypesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   List&lt;String&gt; entityTypeNames = new ArrayList&lt;&gt;();
    *   BatchDeleteEntityTypesRequest request = BatchDeleteEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1085,7 +1119,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntityTypesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   List&lt;String&gt; entityTypeNames = new ArrayList&lt;&gt;();
    *   BatchDeleteEntityTypesRequest request = BatchDeleteEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1112,7 +1146,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntityTypesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   entityTypesClient.batchCreateEntitiesAsync(parent, entities).get();
    * }
@@ -1145,7 +1179,7 @@ public final OperationFuture<Empty, Struct> batchCreateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   entityTypesClient.batchCreateEntitiesAsync(parent.toString(), entities).get();
    * }
@@ -1175,7 +1209,7 @@ public final OperationFuture<Empty, Struct> batchCreateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   String languageCode = "";
    *   entityTypesClient.batchCreateEntitiesAsync(parent, entities, languageCode).get();
@@ -1214,7 +1248,7 @@ public final OperationFuture<Empty, Struct> batchCreateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   String languageCode = "";
    *   entityTypesClient.batchCreateEntitiesAsync(parent.toString(), entities, languageCode).get();
@@ -1253,7 +1287,7 @@ public final OperationFuture<Empty, Struct> batchCreateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   BatchCreateEntitiesRequest request = BatchCreateEntitiesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1283,7 +1317,7 @@ public final OperationFuture<Empty, Struct> batchCreateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   BatchCreateEntitiesRequest request = BatchCreateEntitiesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1311,7 +1345,7 @@ public final OperationFuture<Empty, Struct> batchCreateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   BatchCreateEntitiesRequest request = BatchCreateEntitiesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1338,7 +1372,7 @@ public final UnaryCallable<BatchCreateEntitiesRequest, Operation> batchCreateEnt
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   entityTypesClient.batchUpdateEntitiesAsync(parent, entities).get();
    * }
@@ -1372,7 +1406,7 @@ public final OperationFuture<Empty, Struct> batchUpdateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   entityTypesClient.batchUpdateEntitiesAsync(parent.toString(), entities).get();
    * }
@@ -1403,7 +1437,7 @@ public final OperationFuture<Empty, Struct> batchUpdateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   String languageCode = "";
    *   entityTypesClient.batchUpdateEntitiesAsync(parent, entities, languageCode).get();
@@ -1443,7 +1477,7 @@ public final OperationFuture<Empty, Struct> batchUpdateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   String languageCode = "";
    *   entityTypesClient.batchUpdateEntitiesAsync(parent.toString(), entities, languageCode).get();
@@ -1483,7 +1517,7 @@ public final OperationFuture<Empty, Struct> batchUpdateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   BatchUpdateEntitiesRequest request = BatchUpdateEntitiesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1514,7 +1548,7 @@ public final OperationFuture<Empty, Struct> batchUpdateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   BatchUpdateEntitiesRequest request = BatchUpdateEntitiesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1543,7 +1577,7 @@ public final OperationFuture<Empty, Struct> batchUpdateEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;EntityType.Entity&gt; entities = new ArrayList&lt;&gt;();
    *   BatchUpdateEntitiesRequest request = BatchUpdateEntitiesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1569,7 +1603,7 @@ public final UnaryCallable<BatchUpdateEntitiesRequest, Operation> batchUpdateEnt
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;String&gt; entityValues = new ArrayList&lt;&gt;();
    *   entityTypesClient.batchDeleteEntitiesAsync(parent, entityValues).get();
    * }
@@ -1603,7 +1637,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;String&gt; entityValues = new ArrayList&lt;&gt;();
    *   entityTypesClient.batchDeleteEntitiesAsync(parent.toString(), entityValues).get();
    * }
@@ -1637,7 +1671,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;String&gt; entityValues = new ArrayList&lt;&gt;();
    *   String languageCode = "";
    *   entityTypesClient.batchDeleteEntitiesAsync(parent, entityValues, languageCode).get();
@@ -1677,7 +1711,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;String&gt; entityValues = new ArrayList&lt;&gt;();
    *   String languageCode = "";
    *   entityTypesClient.batchDeleteEntitiesAsync(parent.toString(), entityValues, languageCode).get();
@@ -1717,7 +1751,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;String&gt; entityValues = new ArrayList&lt;&gt;();
    *   BatchDeleteEntitiesRequest request = BatchDeleteEntitiesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1747,7 +1781,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;String&gt; entityValues = new ArrayList&lt;&gt;();
    *   BatchDeleteEntitiesRequest request = BatchDeleteEntitiesRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1775,7 +1809,7 @@ public final OperationFuture<Empty, Struct> batchDeleteEntitiesAsync(
    *
    * <pre><code>
    * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
-   *   EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+   *   EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
    *   List&lt;String&gt; entityValues = new ArrayList&lt;&gt;();
    *   BatchDeleteEntitiesRequest request = BatchDeleteEntitiesRequest.newBuilder()
    *     .setParent(parent.toString())
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentsClient.java
index 5277b8777..32ee61b6b 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentsClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentsClient.java
@@ -44,7 +44,7 @@
  * <pre>
  * <code>
  * try (EnvironmentsClient environmentsClient = EnvironmentsClient.create()) {
- *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+ *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
  *   for (Environment element : environmentsClient.listEnvironments(parent).iterateAll()) {
  *     // doThingsWith(element);
  *   }
@@ -163,7 +163,7 @@ public EnvironmentsStub getStub() {
    *
    * <pre><code>
    * try (EnvironmentsClient environmentsClient = EnvironmentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   for (Environment element : environmentsClient.listEnvironments(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -175,7 +175,7 @@ public EnvironmentsStub getStub() {
    *     ID&gt;/locations/&lt;Location ID&gt;/agent
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListEnvironmentsPagedResponse listEnvironments(ProjectAgentName parent) {
+  public final ListEnvironmentsPagedResponse listEnvironments(AgentName parent) {
     ListEnvironmentsRequest request =
         ListEnvironmentsRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -191,7 +191,7 @@ public final ListEnvironmentsPagedResponse listEnvironments(ProjectAgentName par
    *
    * <pre><code>
    * try (EnvironmentsClient environmentsClient = EnvironmentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   for (Environment element : environmentsClient.listEnvironments(parent.toString()).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -217,7 +217,7 @@ public final ListEnvironmentsPagedResponse listEnvironments(String parent) {
    *
    * <pre><code>
    * try (EnvironmentsClient environmentsClient = EnvironmentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   ListEnvironmentsRequest request = ListEnvironmentsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -242,7 +242,7 @@ public final ListEnvironmentsPagedResponse listEnvironments(ListEnvironmentsRequ
    *
    * <pre><code>
    * try (EnvironmentsClient environmentsClient = EnvironmentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   ListEnvironmentsRequest request = ListEnvironmentsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -267,7 +267,7 @@ public final ListEnvironmentsPagedResponse listEnvironments(ListEnvironmentsRequ
    *
    * <pre><code>
    * try (EnvironmentsClient environmentsClient = EnvironmentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   ListEnvironmentsRequest request = ListEnvironmentsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java
index d75307f83..a35ee4883 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentsClient.java
@@ -50,7 +50,7 @@
  * <pre>
  * <code>
  * try (IntentsClient intentsClient = IntentsClient.create()) {
- *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+ *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
  *   Intent response = intentsClient.getIntent(name);
  * }
  * </code>
@@ -179,7 +179,7 @@ public final OperationsClient getOperationsClient() {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   for (Intent element : intentsClient.listIntents(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -190,7 +190,7 @@ public final OperationsClient getOperationsClient() {
    *     ID&gt;/agent`.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListIntentsPagedResponse listIntents(ProjectAgentName parent) {
+  public final ListIntentsPagedResponse listIntents(AgentName parent) {
     ListIntentsRequest request =
         ListIntentsRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -206,7 +206,7 @@ public final ListIntentsPagedResponse listIntents(ProjectAgentName parent) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   for (Intent element : intentsClient.listIntents(parent.toString()).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -230,7 +230,7 @@ public final ListIntentsPagedResponse listIntents(String parent) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   String languageCode = "";
    *   for (Intent element : intentsClient.listIntents(parent, languageCode).iterateAll()) {
    *     // doThingsWith(element);
@@ -246,7 +246,7 @@ public final ListIntentsPagedResponse listIntents(String parent) {
    *     data](https://cloud.google.com/dialogflow/docs/agents-multilingual#intent-entity).
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final ListIntentsPagedResponse listIntents(ProjectAgentName parent, String languageCode) {
+  public final ListIntentsPagedResponse listIntents(AgentName parent, String languageCode) {
     ListIntentsRequest request =
         ListIntentsRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -263,7 +263,7 @@ public final ListIntentsPagedResponse listIntents(ProjectAgentName parent, Strin
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   String languageCode = "";
    *   for (Intent element : intentsClient.listIntents(parent.toString(), languageCode).iterateAll()) {
    *     // doThingsWith(element);
@@ -293,7 +293,7 @@ public final ListIntentsPagedResponse listIntents(String parent, String language
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   ListIntentsRequest request = ListIntentsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -318,7 +318,7 @@ public final ListIntentsPagedResponse listIntents(ListIntentsRequest request) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   ListIntentsRequest request = ListIntentsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -343,7 +343,7 @@ public final ListIntentsPagedResponse listIntents(ListIntentsRequest request) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   ListIntentsRequest request = ListIntentsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -374,7 +374,7 @@ public final UnaryCallable<ListIntentsRequest, ListIntentsResponse> listIntentsC
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+   *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
    *   Intent response = intentsClient.getIntent(name);
    * }
    * </code></pre>
@@ -397,7 +397,7 @@ public final Intent getIntent(IntentName name) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+   *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
    *   Intent response = intentsClient.getIntent(name.toString());
    * }
    * </code></pre>
@@ -419,7 +419,7 @@ public final Intent getIntent(String name) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+   *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
    *   String languageCode = "";
    *   Intent response = intentsClient.getIntent(name, languageCode);
    * }
@@ -450,7 +450,7 @@ public final Intent getIntent(IntentName name, String languageCode) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+   *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
    *   String languageCode = "";
    *   Intent response = intentsClient.getIntent(name.toString(), languageCode);
    * }
@@ -478,7 +478,7 @@ public final Intent getIntent(String name, String languageCode) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+   *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
    *   GetIntentRequest request = GetIntentRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -501,7 +501,7 @@ public final Intent getIntent(GetIntentRequest request) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+   *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
    *   GetIntentRequest request = GetIntentRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -523,7 +523,7 @@ public final UnaryCallable<GetIntentRequest, Intent> getIntentCallable() {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   Intent intent = Intent.newBuilder().build();
    *   Intent response = intentsClient.createIntent(parent, intent);
    * }
@@ -534,7 +534,7 @@ public final UnaryCallable<GetIntentRequest, Intent> getIntentCallable() {
    * @param intent Required. The intent to create.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Intent createIntent(ProjectAgentName parent, Intent intent) {
+  public final Intent createIntent(AgentName parent, Intent intent) {
     CreateIntentRequest request =
         CreateIntentRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -551,7 +551,7 @@ public final Intent createIntent(ProjectAgentName parent, Intent intent) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   Intent intent = Intent.newBuilder().build();
    *   Intent response = intentsClient.createIntent(parent.toString(), intent);
    * }
@@ -576,7 +576,7 @@ public final Intent createIntent(String parent, Intent intent) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   Intent intent = Intent.newBuilder().build();
    *   String languageCode = "";
    *   Intent response = intentsClient.createIntent(parent, intent, languageCode);
@@ -592,7 +592,7 @@ public final Intent createIntent(String parent, Intent intent) {
    *     data](https://cloud.google.com/dialogflow/docs/agents-multilingual#intent-entity).
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
-  public final Intent createIntent(ProjectAgentName parent, Intent intent, String languageCode) {
+  public final Intent createIntent(AgentName parent, Intent intent, String languageCode) {
     CreateIntentRequest request =
         CreateIntentRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -610,7 +610,7 @@ public final Intent createIntent(ProjectAgentName parent, Intent intent, String
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   Intent intent = Intent.newBuilder().build();
    *   String languageCode = "";
    *   Intent response = intentsClient.createIntent(parent.toString(), intent, languageCode);
@@ -644,7 +644,7 @@ public final Intent createIntent(String parent, Intent intent, String languageCo
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   Intent intent = Intent.newBuilder().build();
    *   CreateIntentRequest request = CreateIntentRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -669,7 +669,7 @@ public final Intent createIntent(CreateIntentRequest request) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   Intent intent = Intent.newBuilder().build();
    *   CreateIntentRequest request = CreateIntentRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -685,6 +685,51 @@ public final UnaryCallable<CreateIntentRequest, Intent> createIntentCallable() {
     return stub.createIntentCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates the specified intent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (IntentsClient intentsClient = IntentsClient.create()) {
+   *   Intent intent = Intent.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   Intent response = intentsClient.updateIntent(intent, updateMask);
+   * }
+   * </code></pre>
+   *
+   * @param intent Required. The intent to update.
+   * @param updateMask Optional. The mask to control which fields get updated.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Intent updateIntent(Intent intent, FieldMask updateMask) {
+    UpdateIntentRequest request =
+        UpdateIntentRequest.newBuilder().setIntent(intent).setUpdateMask(updateMask).build();
+    return updateIntent(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates the specified intent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (IntentsClient intentsClient = IntentsClient.create()) {
+   *   Intent intent = Intent.newBuilder().build();
+   *   Intent response = intentsClient.updateIntent(intent);
+   * }
+   * </code></pre>
+   *
+   * @param intent Required. The intent to update.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Intent updateIntent(Intent intent) {
+    UpdateIntentRequest request = UpdateIntentRequest.newBuilder().setIntent(intent).build();
+    return updateIntent(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Updates the specified intent.
@@ -798,7 +843,7 @@ public final UnaryCallable<UpdateIntentRequest, Intent> updateIntentCallable() {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+   *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
    *   intentsClient.deleteIntent(name);
    * }
    * </code></pre>
@@ -822,7 +867,7 @@ public final void deleteIntent(IntentName name) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+   *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
    *   intentsClient.deleteIntent(name.toString());
    * }
    * </code></pre>
@@ -845,7 +890,7 @@ public final void deleteIntent(String name) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+   *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
    *   DeleteIntentRequest request = DeleteIntentRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -868,7 +913,7 @@ public final void deleteIntent(DeleteIntentRequest request) {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+   *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
    *   DeleteIntentRequest request = DeleteIntentRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -893,7 +938,7 @@ public final UnaryCallable<DeleteIntentRequest, Empty> deleteIntentCallable() {
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   BatchUpdateIntentsRequest request = BatchUpdateIntentsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -922,7 +967,7 @@ public final OperationFuture<BatchUpdateIntentsResponse, Struct> batchUpdateInte
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   BatchUpdateIntentsRequest request = BatchUpdateIntentsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -949,7 +994,7 @@ public final OperationFuture<BatchUpdateIntentsResponse, Struct> batchUpdateInte
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   BatchUpdateIntentsRequest request = BatchUpdateIntentsRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -973,7 +1018,7 @@ public final UnaryCallable<BatchUpdateIntentsRequest, Operation> batchUpdateInte
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   List&lt;Intent&gt; intents = new ArrayList&lt;&gt;();
    *   intentsClient.batchDeleteIntentsAsync(parent, intents).get();
    * }
@@ -988,7 +1033,7 @@ public final UnaryCallable<BatchUpdateIntentsRequest, Operation> batchUpdateInte
   @BetaApi(
       "The surface for long-running operations is not stable yet and may change in the future.")
   public final OperationFuture<Empty, Struct> batchDeleteIntentsAsync(
-      ProjectAgentName parent, List<Intent> intents) {
+      AgentName parent, List<Intent> intents) {
     BatchDeleteIntentsRequest request =
         BatchDeleteIntentsRequest.newBuilder()
             .setParent(parent == null ? null : parent.toString())
@@ -1007,7 +1052,7 @@ public final OperationFuture<Empty, Struct> batchDeleteIntentsAsync(
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   List&lt;Intent&gt; intents = new ArrayList&lt;&gt;();
    *   intentsClient.batchDeleteIntentsAsync(parent.toString(), intents).get();
    * }
@@ -1038,7 +1083,7 @@ public final OperationFuture<Empty, Struct> batchDeleteIntentsAsync(
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   List&lt;Intent&gt; intents = new ArrayList&lt;&gt;();
    *   BatchDeleteIntentsRequest request = BatchDeleteIntentsRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1068,7 +1113,7 @@ public final OperationFuture<Empty, Struct> batchDeleteIntentsAsync(
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   List&lt;Intent&gt; intents = new ArrayList&lt;&gt;();
    *   BatchDeleteIntentsRequest request = BatchDeleteIntentsRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -1096,7 +1141,7 @@ public final OperationFuture<Empty, Struct> batchDeleteIntentsAsync(
    *
    * <pre><code>
    * try (IntentsClient intentsClient = IntentsClient.create()) {
-   *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+   *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
    *   List&lt;Intent&gt; intents = new ArrayList&lt;&gt;();
    *   BatchDeleteIntentsRequest request = BatchDeleteIntentsRequest.newBuilder()
    *     .setParent(parent.toString())
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClient.java
index 56ebd04af..fbe7f1b1e 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClient.java
@@ -29,6 +29,7 @@
 import com.google.cloud.dialogflow.v2beta1.stub.KnowledgeBasesStubSettings;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -630,6 +631,38 @@ public final UnaryCallable<DeleteKnowledgeBaseRequest, Empty> deleteKnowledgeBas
     return stub.deleteKnowledgeBaseCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates the specified knowledge base.
+   *
+   * <p>Note: The `projects.agent.knowledgeBases` resource is deprecated; only use
+   * `projects.knowledgeBases`.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (KnowledgeBasesClient knowledgeBasesClient = KnowledgeBasesClient.create()) {
+   *   KnowledgeBase knowledgeBase = KnowledgeBase.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   KnowledgeBase response = knowledgeBasesClient.updateKnowledgeBase(knowledgeBase, updateMask);
+   * }
+   * </code></pre>
+   *
+   * @param knowledgeBase Required. The knowledge base to update.
+   * @param updateMask Optional. Not specified means `update all`. Currently, only `display_name`
+   *     can be updated, an InvalidArgument will be returned for attempting to update other fields.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final KnowledgeBase updateKnowledgeBase(
+      KnowledgeBase knowledgeBase, FieldMask updateMask) {
+    UpdateKnowledgeBaseRequest request =
+        UpdateKnowledgeBaseRequest.newBuilder()
+            .setKnowledgeBase(knowledgeBase)
+            .setUpdateMask(updateMask)
+            .build();
+    return updateKnowledgeBase(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Updates the specified knowledge base.
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java
index 34ea85a97..6de8f243c 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClient.java
@@ -29,6 +29,7 @@
 import com.google.cloud.dialogflow.v2beta1.stub.SessionEntityTypesStubSettings;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -45,7 +46,7 @@
  * <pre>
  * <code>
  * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
- *   SessionEntityTypeName name = SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+ *   SessionEntityTypeName name = SessionEntityTypeName.ofProjectSessionEntityTypeName("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
  *   SessionEntityType response = sessionEntityTypesClient.getSessionEntityType(name);
  * }
  * </code>
@@ -167,7 +168,7 @@ public SessionEntityTypesStub getStub() {
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   for (SessionEntityType element : sessionEntityTypesClient.listSessionEntityTypes(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -200,7 +201,7 @@ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(SessionN
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   for (SessionEntityType element : sessionEntityTypesClient.listSessionEntityTypes(parent.toString()).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -231,7 +232,7 @@ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(String p
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   ListSessionEntityTypesRequest request = ListSessionEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -260,7 +261,7 @@ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   ListSessionEntityTypesRequest request = ListSessionEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -288,7 +289,7 @@ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   ListSessionEntityTypesRequest request = ListSessionEntityTypesRequest.newBuilder()
    *     .setParent(parent.toString())
    *     .build();
@@ -323,7 +324,7 @@ public final ListSessionEntityTypesPagedResponse listSessionEntityTypes(
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionEntityTypeName name = SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+   *   SessionEntityTypeName name = SessionEntityTypeName.ofProjectSessionEntityTypeName("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
    *   SessionEntityType response = sessionEntityTypesClient.getSessionEntityType(name);
    * }
    * </code></pre>
@@ -355,7 +356,7 @@ public final SessionEntityType getSessionEntityType(SessionEntityTypeName name)
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionEntityTypeName name = SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+   *   SessionEntityTypeName name = SessionEntityTypeName.ofProjectSessionEntityTypeName("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
    *   SessionEntityType response = sessionEntityTypesClient.getSessionEntityType(name.toString());
    * }
    * </code></pre>
@@ -385,7 +386,7 @@ public final SessionEntityType getSessionEntityType(String name) {
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionEntityTypeName name = SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+   *   SessionEntityTypeName name = SessionEntityTypeName.ofProjectSessionEntityTypeName("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
    *   GetSessionEntityTypeRequest request = GetSessionEntityTypeRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -411,7 +412,7 @@ public final SessionEntityType getSessionEntityType(GetSessionEntityTypeRequest
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionEntityTypeName name = SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+   *   SessionEntityTypeName name = SessionEntityTypeName.ofProjectSessionEntityTypeName("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
    *   GetSessionEntityTypeRequest request = GetSessionEntityTypeRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -439,7 +440,7 @@ public final SessionEntityType getSessionEntityType(GetSessionEntityTypeRequest
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   SessionEntityType sessionEntityType = SessionEntityType.newBuilder().build();
    *   SessionEntityType response = sessionEntityTypesClient.createSessionEntityType(parent, sessionEntityType);
    * }
@@ -476,7 +477,7 @@ public final SessionEntityType createSessionEntityType(
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   SessionEntityType sessionEntityType = SessionEntityType.newBuilder().build();
    *   SessionEntityType response = sessionEntityTypesClient.createSessionEntityType(parent.toString(), sessionEntityType);
    * }
@@ -513,7 +514,7 @@ public final SessionEntityType createSessionEntityType(
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   SessionEntityType sessionEntityType = SessionEntityType.newBuilder().build();
    *   CreateSessionEntityTypeRequest request = CreateSessionEntityTypeRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -543,7 +544,7 @@ public final SessionEntityType createSessionEntityType(CreateSessionEntityTypeRe
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   SessionEntityType sessionEntityType = SessionEntityType.newBuilder().build();
    *   CreateSessionEntityTypeRequest request = CreateSessionEntityTypeRequest.newBuilder()
    *     .setParent(parent.toString())
@@ -585,6 +586,37 @@ public final SessionEntityType updateSessionEntityType(SessionEntityType session
     return updateSessionEntityType(request);
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Updates the specified session entity type.
+   *
+   * <p>This method doesn't work with Google Assistant integration. Contact Dialogflow support if
+   * you need to use session entities with Google Assistant integration.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
+   *   SessionEntityType sessionEntityType = SessionEntityType.newBuilder().build();
+   *   FieldMask updateMask = FieldMask.newBuilder().build();
+   *   SessionEntityType response = sessionEntityTypesClient.updateSessionEntityType(sessionEntityType, updateMask);
+   * }
+   * </code></pre>
+   *
+   * @param sessionEntityType Required. The session entity type to update.
+   * @param updateMask Optional. The mask to control which fields get updated.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final SessionEntityType updateSessionEntityType(
+      SessionEntityType sessionEntityType, FieldMask updateMask) {
+    UpdateSessionEntityTypeRequest request =
+        UpdateSessionEntityTypeRequest.newBuilder()
+            .setSessionEntityType(sessionEntityType)
+            .setUpdateMask(updateMask)
+            .build();
+    return updateSessionEntityType(request);
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Updates the specified session entity type.
@@ -648,7 +680,7 @@ public final SessionEntityType updateSessionEntityType(UpdateSessionEntityTypeRe
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionEntityTypeName name = SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+   *   SessionEntityTypeName name = SessionEntityTypeName.ofProjectSessionEntityTypeName("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
    *   sessionEntityTypesClient.deleteSessionEntityType(name);
    * }
    * </code></pre>
@@ -680,7 +712,7 @@ public final void deleteSessionEntityType(SessionEntityTypeName name) {
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionEntityTypeName name = SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+   *   SessionEntityTypeName name = SessionEntityTypeName.ofProjectSessionEntityTypeName("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
    *   sessionEntityTypesClient.deleteSessionEntityType(name.toString());
    * }
    * </code></pre>
@@ -710,7 +742,7 @@ public final void deleteSessionEntityType(String name) {
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionEntityTypeName name = SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+   *   SessionEntityTypeName name = SessionEntityTypeName.ofProjectSessionEntityTypeName("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
    *   DeleteSessionEntityTypeRequest request = DeleteSessionEntityTypeRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
@@ -736,7 +768,7 @@ public final void deleteSessionEntityType(DeleteSessionEntityTypeRequest request
    *
    * <pre><code>
    * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
-   *   SessionEntityTypeName name = SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+   *   SessionEntityTypeName name = SessionEntityTypeName.ofProjectSessionEntityTypeName("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
    *   DeleteSessionEntityTypeRequest request = DeleteSessionEntityTypeRequest.newBuilder()
    *     .setName(name.toString())
    *     .build();
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java
index 01c25ce49..0bccfa8df 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionsClient.java
@@ -38,7 +38,7 @@
  * <pre>
  * <code>
  * try (SessionsClient sessionsClient = SessionsClient.create()) {
- *   SessionName session = SessionName.of("[PROJECT]", "[SESSION]");
+ *   SessionName session = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
  *   QueryInput queryInput = QueryInput.newBuilder().build();
  *   DetectIntentResponse response = sessionsClient.detectIntent(session, queryInput);
  * }
@@ -157,7 +157,7 @@ public SessionsStub getStub() {
    *
    * <pre><code>
    * try (SessionsClient sessionsClient = SessionsClient.create()) {
-   *   SessionName session = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName session = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   QueryInput queryInput = QueryInput.newBuilder().build();
    *   DetectIntentResponse response = sessionsClient.detectIntent(session, queryInput);
    * }
@@ -199,7 +199,7 @@ public final DetectIntentResponse detectIntent(SessionName session, QueryInput q
    *
    * <pre><code>
    * try (SessionsClient sessionsClient = SessionsClient.create()) {
-   *   SessionName session = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName session = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   QueryInput queryInput = QueryInput.newBuilder().build();
    *   DetectIntentResponse response = sessionsClient.detectIntent(session.toString(), queryInput);
    * }
@@ -238,7 +238,7 @@ public final DetectIntentResponse detectIntent(String session, QueryInput queryI
    *
    * <pre><code>
    * try (SessionsClient sessionsClient = SessionsClient.create()) {
-   *   SessionName session = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName session = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   QueryInput queryInput = QueryInput.newBuilder().build();
    *   DetectIntentRequest request = DetectIntentRequest.newBuilder()
    *     .setSession(session.toString())
@@ -265,7 +265,7 @@ public final DetectIntentResponse detectIntent(DetectIntentRequest request) {
    *
    * <pre><code>
    * try (SessionsClient sessionsClient = SessionsClient.create()) {
-   *   SessionName session = SessionName.of("[PROJECT]", "[SESSION]");
+   *   SessionName session = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
    *   QueryInput queryInput = QueryInput.newBuilder().build();
    *   DetectIntentRequest request = DetectIntentRequest.newBuilder()
    *     .setSession(session.toString())
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java
index f4a446bd8..6c44834b7 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java
@@ -19,7 +19,23 @@
  *
  * <p>The interfaces provided are listed below, along with usage samples.
  *
- * <p>============ AgentsClient ============
+ * <p>================== EnvironmentsClient ==================
+ *
+ * <p>Service Description: Service for managing
+ * [Environments][google.cloud.dialogflow.v2beta1.Environment].
+ *
+ * <p>Sample for EnvironmentsClient:
+ *
+ * <pre>
+ * <code>
+ * try (EnvironmentsClient environmentsClient = EnvironmentsClient.create()) {
+ *   AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
+ *   ListEnvironmentsPagedResponse response = environmentsClient.listEnvironments(parent);
+ * }
+ * </code>
+ * </pre>
+ *
+ * ============ AgentsClient ============
  *
  * <p>Service Description: Service for managing [Agents][google.cloud.dialogflow.v2beta1.Agent].
  *
@@ -28,8 +44,8 @@
  * <pre>
  * <code>
  * try (AgentsClient agentsClient = AgentsClient.create()) {
- *   Agent agent = Agent.newBuilder().build();
- *   Agent response = agentsClient.setAgent(agent);
+ *   ProjectName parent = ProjectName.of("[PROJECT]");
+ *   Agent response = agentsClient.getAgent(parent);
  * }
  * </code>
  * </pre>
@@ -43,7 +59,7 @@
  * <pre>
  * <code>
  * try (ContextsClient contextsClient = ContextsClient.create()) {
- *   ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+ *   ContextName name = ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
  *   Context response = contextsClient.getContext(name);
  * }
  * </code>
@@ -75,28 +91,12 @@
  * <pre>
  * <code>
  * try (EntityTypesClient entityTypesClient = EntityTypesClient.create()) {
- *   EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+ *   EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
  *   EntityType response = entityTypesClient.getEntityType(name);
  * }
  * </code>
  * </pre>
  *
- * ================== EnvironmentsClient ==================
- *
- * <p>Service Description: Service for managing
- * [Environments][google.cloud.dialogflow.v2beta1.Environment].
- *
- * <p>Sample for EnvironmentsClient:
- *
- * <pre>
- * <code>
- * try (EnvironmentsClient environmentsClient = EnvironmentsClient.create()) {
- *   ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
- *   ListEnvironmentsPagedResponse response = environmentsClient.listEnvironments(parent);
- * }
- * </code>
- * </pre>
- *
  * ============= IntentsClient =============
  *
  * <p>Service Description: Service for managing [Intents][google.cloud.dialogflow.v2beta1.Intent].
@@ -106,7 +106,7 @@
  * <pre>
  * <code>
  * try (IntentsClient intentsClient = IntentsClient.create()) {
- *   IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+ *   IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
  *   Intent response = intentsClient.getIntent(name);
  * }
  * </code>
@@ -138,7 +138,7 @@
  * <pre>
  * <code>
  * try (SessionEntityTypesClient sessionEntityTypesClient = SessionEntityTypesClient.create()) {
- *   SessionEntityTypeName name = SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+ *   SessionEntityTypeName name = SessionEntityTypeName.ofProjectSessionEntityTypeName("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
  *   SessionEntityType response = sessionEntityTypesClient.getSessionEntityType(name);
  * }
  * </code>
@@ -156,7 +156,7 @@
  * <pre>
  * <code>
  * try (SessionsClient sessionsClient = SessionsClient.create()) {
- *   SessionName session = SessionName.of("[PROJECT]", "[SESSION]");
+ *   SessionName session = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
  *   QueryInput queryInput = QueryInput.newBuilder().build();
  *   DetectIntentResponse response = sessionsClient.detectIntent(session, queryInput);
  * }
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
index c70a8a9d9..812531a87 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
@@ -55,6 +55,10 @@ public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
 
+  public UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
+    throw new UnsupportedOperationException("Not implemented: getAgentCallable()");
+  }
+
   public UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: setAgentCallable()");
   }
@@ -63,10 +67,6 @@ public UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: deleteAgentCallable()");
   }
 
-  public UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
-    throw new UnsupportedOperationException("Not implemented: getAgentCallable()");
-  }
-
   public UnaryCallable<SearchAgentsRequest, SearchAgentsPagedResponse> searchAgentsPagedCallable() {
     throw new UnsupportedOperationException("Not implemented: searchAgentsPagedCallable()");
   }
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
index 39a2c36b0..1c486b2f3 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
@@ -83,16 +83,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of setAgent to 30 seconds:
+ * <p>For example, to set the total timeout of getAgent to 30 seconds:
  *
  * <pre>
  * <code>
  * AgentsStubSettings.Builder agentsSettingsBuilder =
  *     AgentsStubSettings.newBuilder();
  * agentsSettingsBuilder
- *     .setAgentSettings()
+ *     .getAgentSettings()
  *     .setRetrySettings(
- *         agentsSettingsBuilder.setAgentSettings().getRetrySettings().toBuilder()
+ *         agentsSettingsBuilder.getAgentSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * AgentsStubSettings agentsSettings = agentsSettingsBuilder.build();
@@ -109,9 +109,9 @@ public class AgentsStubSettings extends StubSettings<AgentsStubSettings> {
           .add("https://www.googleapis.com/auth/dialogflow")
           .build();
 
+  private final UnaryCallSettings<GetAgentRequest, Agent> getAgentSettings;
   private final UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings;
   private final UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings;
-  private final UnaryCallSettings<GetAgentRequest, Agent> getAgentSettings;
   private final PagedCallSettings<
           SearchAgentsRequest, SearchAgentsResponse, SearchAgentsPagedResponse>
       searchAgentsSettings;
@@ -129,6 +129,11 @@ public class AgentsStubSettings extends StubSettings<AgentsStubSettings> {
   private final UnaryCallSettings<GetValidationResultRequest, ValidationResult>
       getValidationResultSettings;
 
+  /** Returns the object with the settings used for calls to getAgent. */
+  public UnaryCallSettings<GetAgentRequest, Agent> getAgentSettings() {
+    return getAgentSettings;
+  }
+
   /** Returns the object with the settings used for calls to setAgent. */
   public UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings() {
     return setAgentSettings;
@@ -139,11 +144,6 @@ public UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings() {
     return deleteAgentSettings;
   }
 
-  /** Returns the object with the settings used for calls to getAgent. */
-  public UnaryCallSettings<GetAgentRequest, Agent> getAgentSettings() {
-    return getAgentSettings;
-  }
-
   /** Returns the object with the settings used for calls to searchAgents. */
   public PagedCallSettings<SearchAgentsRequest, SearchAgentsResponse, SearchAgentsPagedResponse>
       searchAgentsSettings() {
@@ -269,9 +269,9 @@ public Builder toBuilder() {
   protected AgentsStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
+    getAgentSettings = settingsBuilder.getAgentSettings().build();
     setAgentSettings = settingsBuilder.setAgentSettings().build();
     deleteAgentSettings = settingsBuilder.deleteAgentSettings().build();
-    getAgentSettings = settingsBuilder.getAgentSettings().build();
     searchAgentsSettings = settingsBuilder.searchAgentsSettings().build();
     trainAgentSettings = settingsBuilder.trainAgentSettings().build();
     trainAgentOperationSettings = settingsBuilder.trainAgentOperationSettings().build();
@@ -341,9 +341,9 @@ public ApiFuture<SearchAgentsPagedResponse> getFuturePagedResponse(
   public static class Builder extends StubSettings.Builder<AgentsStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
 
+    private final UnaryCallSettings.Builder<GetAgentRequest, Agent> getAgentSettings;
     private final UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings;
     private final UnaryCallSettings.Builder<DeleteAgentRequest, Empty> deleteAgentSettings;
-    private final UnaryCallSettings.Builder<GetAgentRequest, Agent> getAgentSettings;
     private final PagedCallSettings.Builder<
             SearchAgentsRequest, SearchAgentsResponse, SearchAgentsPagedResponse>
         searchAgentsSettings;
@@ -369,11 +369,17 @@ public static class Builder extends StubSettings.Builder<AgentsStubSettings, Bui
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -387,12 +393,44 @@ public static class Builder extends StubSettings.Builder<AgentsStubSettings, Bui
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(180000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(180000L))
+              .setTotalTimeout(Duration.ofMillis(180000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
+              .build();
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -403,12 +441,12 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
+      getAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       setAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       deleteAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
-      getAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       searchAgentsSettings = PagedCallSettings.newBuilder(SEARCH_AGENTS_PAGE_STR_FACT);
 
       trainAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -431,9 +469,9 @@ protected Builder(ClientContext clientContext) {
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
+              getAgentSettings,
               setAgentSettings,
               deleteAgentSettings,
-              getAgentSettings,
               searchAgentsSettings,
               trainAgentSettings,
               exportAgentSettings,
@@ -456,55 +494,55 @@ private static Builder createDefault() {
     private static Builder initDefaults(Builder builder) {
 
       builder
-          .setAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .getAgentSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
-          .deleteAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setAgentSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
-          .getAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .deleteAgentSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .searchAgentsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .trainAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .exportAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .importAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .restoreAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .getValidationResultSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
       builder
           .trainAgentOperationSettings()
           .setInitialCallSettings(
               UnaryCallSettings.<TrainAgentRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
@@ -525,8 +563,8 @@ private static Builder initDefaults(Builder builder) {
           .exportAgentOperationSettings()
           .setInitialCallSettings(
               UnaryCallSettings.<ExportAgentRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(ExportAgentResponse.class))
@@ -547,8 +585,8 @@ private static Builder initDefaults(Builder builder) {
           .importAgentOperationSettings()
           .setInitialCallSettings(
               UnaryCallSettings.<ImportAgentRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
@@ -570,8 +608,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<RestoreAgentRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
@@ -595,9 +633,9 @@ private static Builder initDefaults(Builder builder) {
     protected Builder(AgentsStubSettings settings) {
       super(settings);
 
+      getAgentSettings = settings.getAgentSettings.toBuilder();
       setAgentSettings = settings.setAgentSettings.toBuilder();
       deleteAgentSettings = settings.deleteAgentSettings.toBuilder();
-      getAgentSettings = settings.getAgentSettings.toBuilder();
       searchAgentsSettings = settings.searchAgentsSettings.toBuilder();
       trainAgentSettings = settings.trainAgentSettings.toBuilder();
       trainAgentOperationSettings = settings.trainAgentOperationSettings.toBuilder();
@@ -611,9 +649,9 @@ protected Builder(AgentsStubSettings settings) {
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
+              getAgentSettings,
               setAgentSettings,
               deleteAgentSettings,
-              getAgentSettings,
               searchAgentsSettings,
               trainAgentSettings,
               exportAgentSettings,
@@ -638,6 +676,11 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
+    /** Returns the builder for the settings used for calls to getAgent. */
+    public UnaryCallSettings.Builder<GetAgentRequest, Agent> getAgentSettings() {
+      return getAgentSettings;
+    }
+
     /** Returns the builder for the settings used for calls to setAgent. */
     public UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings() {
       return setAgentSettings;
@@ -648,11 +691,6 @@ public UnaryCallSettings.Builder<DeleteAgentRequest, Empty> deleteAgentSettings(
       return deleteAgentSettings;
     }
 
-    /** Returns the builder for the settings used for calls to getAgent. */
-    public UnaryCallSettings.Builder<GetAgentRequest, Agent> getAgentSettings() {
-      return getAgentSettings;
-    }
-
     /** Returns the builder for the settings used for calls to searchAgents. */
     public PagedCallSettings.Builder<
             SearchAgentsRequest, SearchAgentsResponse, SearchAgentsPagedResponse>
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java
index 0fda0b564..bdf96ef4b 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/ContextsStubSettings.java
@@ -288,11 +288,17 @@ public static class Builder extends StubSettings.Builder<ContextsStubSettings, B
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -306,12 +312,44 @@ public static class Builder extends StubSettings.Builder<ContextsStubSettings, B
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
+              .build();
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(180000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(180000L))
+              .setTotalTimeout(Duration.ofMillis(180000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -359,33 +397,33 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .listContextsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .getContextSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createContextSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .updateContextSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .deleteContextSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .deleteAllContextsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       return builder;
     }
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStub.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStub.java
index 8fa2ae329..0b0ce1183 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStub.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStub.java
@@ -93,6 +93,12 @@ public UnaryCallable<UpdateDocumentRequest, Operation> updateDocumentCallable()
     throw new UnsupportedOperationException("Not implemented: updateDocumentCallable()");
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+  public OperationCallable<ReloadDocumentRequest, Document, KnowledgeOperationMetadata>
+      reloadDocumentOperationCallable() {
+    throw new UnsupportedOperationException("Not implemented: reloadDocumentOperationCallable()");
+  }
+
   public UnaryCallable<ReloadDocumentRequest, Operation> reloadDocumentCallable() {
     throw new UnsupportedOperationException("Not implemented: reloadDocumentCallable()");
   }
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStubSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStubSettings.java
index 8bf550a4a..6a90476a7 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStubSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/DocumentsStubSettings.java
@@ -118,6 +118,8 @@ public class DocumentsStubSettings extends StubSettings<DocumentsStubSettings> {
   private final OperationCallSettings<UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
       updateDocumentOperationSettings;
   private final UnaryCallSettings<ReloadDocumentRequest, Operation> reloadDocumentSettings;
+  private final OperationCallSettings<ReloadDocumentRequest, Document, KnowledgeOperationMetadata>
+      reloadDocumentOperationSettings;
 
   /** Returns the object with the settings used for calls to listDocuments. */
   public PagedCallSettings<ListDocumentsRequest, ListDocumentsResponse, ListDocumentsPagedResponse>
@@ -171,6 +173,13 @@ public UnaryCallSettings<ReloadDocumentRequest, Operation> reloadDocumentSetting
     return reloadDocumentSettings;
   }
 
+  /** Returns the object with the settings used for calls to reloadDocument. */
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+  public OperationCallSettings<ReloadDocumentRequest, Document, KnowledgeOperationMetadata>
+      reloadDocumentOperationSettings() {
+    return reloadDocumentOperationSettings;
+  }
+
   @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public DocumentsStub createStub() throws IOException {
     if (getTransportChannelProvider()
@@ -248,6 +257,7 @@ protected DocumentsStubSettings(Builder settingsBuilder) throws IOException {
     updateDocumentSettings = settingsBuilder.updateDocumentSettings().build();
     updateDocumentOperationSettings = settingsBuilder.updateDocumentOperationSettings().build();
     reloadDocumentSettings = settingsBuilder.reloadDocumentSettings().build();
+    reloadDocumentOperationSettings = settingsBuilder.reloadDocumentOperationSettings().build();
   }
 
   private static final PagedListDescriptor<ListDocumentsRequest, ListDocumentsResponse, Document>
@@ -328,6 +338,9 @@ public static class Builder extends StubSettings.Builder<DocumentsStubSettings,
         updateDocumentOperationSettings;
     private final UnaryCallSettings.Builder<ReloadDocumentRequest, Operation>
         reloadDocumentSettings;
+    private final OperationCallSettings.Builder<
+            ReloadDocumentRequest, Document, KnowledgeOperationMetadata>
+        reloadDocumentOperationSettings;
 
     private static final ImmutableMap<String, ImmutableSet<StatusCode.Code>>
         RETRYABLE_CODE_DEFINITIONS;
@@ -336,11 +349,17 @@ public static class Builder extends StubSettings.Builder<DocumentsStubSettings,
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -354,12 +373,44 @@ public static class Builder extends StubSettings.Builder<DocumentsStubSettings,
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
+              .build();
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(180000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(180000L))
+              .setTotalTimeout(Duration.ofMillis(180000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
+              .build();
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -388,6 +439,8 @@ protected Builder(ClientContext clientContext) {
 
       reloadDocumentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
+      reloadDocumentOperationSettings = OperationCallSettings.newBuilder();
+
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
               listDocumentsSettings,
@@ -413,40 +466,40 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .listDocumentsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .getDocumentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createDocumentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .deleteDocumentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .updateDocumentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .reloadDocumentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
       builder
           .createDocumentOperationSettings()
           .setInitialCallSettings(
               UnaryCallSettings
                   .<CreateDocumentRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Document.class))
@@ -469,8 +522,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<DeleteDocumentRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
@@ -493,8 +546,32 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<UpdateDocumentRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
+                  .build())
+          .setResponseTransformer(
+              ProtoOperationTransformers.ResponseTransformer.create(Document.class))
+          .setMetadataTransformer(
+              ProtoOperationTransformers.MetadataTransformer.create(
+                  KnowledgeOperationMetadata.class))
+          .setPollingAlgorithm(
+              OperationTimedPollAlgorithm.create(
+                  RetrySettings.newBuilder()
+                      .setInitialRetryDelay(Duration.ofMillis(500L))
+                      .setRetryDelayMultiplier(1.5)
+                      .setMaxRetryDelay(Duration.ofMillis(5000L))
+                      .setInitialRpcTimeout(Duration.ZERO) // ignored
+                      .setRpcTimeoutMultiplier(1.0) // ignored
+                      .setMaxRpcTimeout(Duration.ZERO) // ignored
+                      .setTotalTimeout(Duration.ofMillis(300000L))
+                      .build()));
+      builder
+          .reloadDocumentOperationSettings()
+          .setInitialCallSettings(
+              UnaryCallSettings
+                  .<ReloadDocumentRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Document.class))
@@ -528,6 +605,7 @@ protected Builder(DocumentsStubSettings settings) {
       updateDocumentSettings = settings.updateDocumentSettings.toBuilder();
       updateDocumentOperationSettings = settings.updateDocumentOperationSettings.toBuilder();
       reloadDocumentSettings = settings.reloadDocumentSettings.toBuilder();
+      reloadDocumentOperationSettings = settings.reloadDocumentOperationSettings.toBuilder();
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
@@ -613,6 +691,15 @@ public UnaryCallSettings.Builder<ReloadDocumentRequest, Operation> reloadDocumen
       return reloadDocumentSettings;
     }
 
+    /** Returns the builder for the settings used for calls to reloadDocument. */
+    @BetaApi(
+        "The surface for use by generated code is not stable yet and may change in the future.")
+    public OperationCallSettings.Builder<
+            ReloadDocumentRequest, Document, KnowledgeOperationMetadata>
+        reloadDocumentOperationSettings() {
+      return reloadDocumentOperationSettings;
+    }
+
     @Override
     public DocumentsStubSettings build() throws IOException {
       return new DocumentsStubSettings(this);
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
index ea00a36bd..cf07bbe45 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EntityTypesStubSettings.java
@@ -418,11 +418,17 @@ public static class Builder extends StubSettings.Builder<EntityTypesStubSettings
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -436,12 +442,44 @@ public static class Builder extends StubSettings.Builder<EntityTypesStubSettings
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
+              .build();
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(180000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(180000L))
+              .setTotalTimeout(Duration.ofMillis(180000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -511,60 +549,60 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .listEntityTypesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .getEntityTypeSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createEntityTypeSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .updateEntityTypeSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .deleteEntityTypeSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .batchUpdateEntityTypesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .batchDeleteEntityTypesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .batchCreateEntitiesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .batchUpdateEntitiesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .batchDeleteEntitiesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
       builder
           .batchUpdateEntityTypesOperationSettings()
           .setInitialCallSettings(
               UnaryCallSettings
                   .<BatchUpdateEntityTypesRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(
@@ -587,8 +625,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<BatchDeleteEntityTypesRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
@@ -610,8 +648,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<BatchCreateEntitiesRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
@@ -633,8 +671,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<BatchUpdateEntitiesRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
@@ -656,8 +694,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<BatchDeleteEntitiesRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EnvironmentsStubSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EnvironmentsStubSettings.java
index 3b2b8ff2e..12482818c 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EnvironmentsStubSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/EnvironmentsStubSettings.java
@@ -249,11 +249,17 @@ public static class Builder extends StubSettings.Builder<EnvironmentsStubSetting
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.INTERNAL, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -267,12 +273,44 @@ public static class Builder extends StubSettings.Builder<EnvironmentsStubSetting
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
+              .build();
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(180000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(180000L))
+              .setTotalTimeout(Duration.ofMillis(180000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -304,8 +342,8 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .listEnvironmentsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       return builder;
     }
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
index 9c0bdc685..fef874626 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
@@ -61,6 +61,13 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public class GrpcAgentsStub extends AgentsStub {
 
+  private static final MethodDescriptor<GetAgentRequest, Agent> getAgentMethodDescriptor =
+      MethodDescriptor.<GetAgentRequest, Agent>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.dialogflow.v2beta1.Agents/GetAgent")
+          .setRequestMarshaller(ProtoUtils.marshaller(GetAgentRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Agent.getDefaultInstance()))
+          .build();
   private static final MethodDescriptor<SetAgentRequest, Agent> setAgentMethodDescriptor =
       MethodDescriptor.<SetAgentRequest, Agent>newBuilder()
           .setType(MethodDescriptor.MethodType.UNARY)
@@ -75,13 +82,6 @@ public class GrpcAgentsStub extends AgentsStub {
           .setRequestMarshaller(ProtoUtils.marshaller(DeleteAgentRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
           .build();
-  private static final MethodDescriptor<GetAgentRequest, Agent> getAgentMethodDescriptor =
-      MethodDescriptor.<GetAgentRequest, Agent>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.dialogflow.v2beta1.Agents/GetAgent")
-          .setRequestMarshaller(ProtoUtils.marshaller(GetAgentRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Agent.getDefaultInstance()))
-          .build();
   private static final MethodDescriptor<SearchAgentsRequest, SearchAgentsResponse>
       searchAgentsMethodDescriptor =
           MethodDescriptor.<SearchAgentsRequest, SearchAgentsResponse>newBuilder()
@@ -133,9 +133,9 @@ public class GrpcAgentsStub extends AgentsStub {
   private final BackgroundResource backgroundResources;
   private final GrpcOperationsStub operationsStub;
 
+  private final UnaryCallable<GetAgentRequest, Agent> getAgentCallable;
   private final UnaryCallable<SetAgentRequest, Agent> setAgentCallable;
   private final UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable;
-  private final UnaryCallable<GetAgentRequest, Agent> getAgentCallable;
   private final UnaryCallable<SearchAgentsRequest, SearchAgentsResponse> searchAgentsCallable;
   private final UnaryCallable<SearchAgentsRequest, SearchAgentsPagedResponse>
       searchAgentsPagedCallable;
@@ -188,6 +188,19 @@ protected GrpcAgentsStub(
     this.callableFactory = callableFactory;
     this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory);
 
+    GrpcCallSettings<GetAgentRequest, Agent> getAgentTransportSettings =
+        GrpcCallSettings.<GetAgentRequest, Agent>newBuilder()
+            .setMethodDescriptor(getAgentMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<GetAgentRequest>() {
+                  @Override
+                  public Map<String, String> extract(GetAgentRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("parent", String.valueOf(request.getParent()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings<SetAgentRequest, Agent> setAgentTransportSettings =
         GrpcCallSettings.<SetAgentRequest, Agent>newBuilder()
             .setMethodDescriptor(setAgentMethodDescriptor)
@@ -214,19 +227,6 @@ public Map<String, String> extract(DeleteAgentRequest request) {
                   }
                 })
             .build();
-    GrpcCallSettings<GetAgentRequest, Agent> getAgentTransportSettings =
-        GrpcCallSettings.<GetAgentRequest, Agent>newBuilder()
-            .setMethodDescriptor(getAgentMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<GetAgentRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetAgentRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<SearchAgentsRequest, SearchAgentsResponse> searchAgentsTransportSettings =
         GrpcCallSettings.<SearchAgentsRequest, SearchAgentsResponse>newBuilder()
             .setMethodDescriptor(searchAgentsMethodDescriptor)
@@ -307,15 +307,15 @@ public Map<String, String> extract(GetValidationResultRequest request) {
                     })
                 .build();
 
+    this.getAgentCallable =
+        callableFactory.createUnaryCallable(
+            getAgentTransportSettings, settings.getAgentSettings(), clientContext);
     this.setAgentCallable =
         callableFactory.createUnaryCallable(
             setAgentTransportSettings, settings.setAgentSettings(), clientContext);
     this.deleteAgentCallable =
         callableFactory.createUnaryCallable(
             deleteAgentTransportSettings, settings.deleteAgentSettings(), clientContext);
-    this.getAgentCallable =
-        callableFactory.createUnaryCallable(
-            getAgentTransportSettings, settings.getAgentSettings(), clientContext);
     this.searchAgentsCallable =
         callableFactory.createUnaryCallable(
             searchAgentsTransportSettings, settings.searchAgentsSettings(), clientContext);
@@ -372,6 +372,10 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  public UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
+    return getAgentCallable;
+  }
+
   public UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
     return setAgentCallable;
   }
@@ -380,10 +384,6 @@ public UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
     return deleteAgentCallable;
   }
 
-  public UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
-    return getAgentCallable;
-  }
-
   public UnaryCallable<SearchAgentsRequest, SearchAgentsPagedResponse> searchAgentsPagedCallable() {
     return searchAgentsPagedCallable;
   }
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcDocumentsStub.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcDocumentsStub.java
index ee4fdc5ab..73c4afbc6 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcDocumentsStub.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcDocumentsStub.java
@@ -127,6 +127,8 @@ public class GrpcDocumentsStub extends DocumentsStub {
   private final OperationCallable<UpdateDocumentRequest, Document, KnowledgeOperationMetadata>
       updateDocumentOperationCallable;
   private final UnaryCallable<ReloadDocumentRequest, Operation> reloadDocumentCallable;
+  private final OperationCallable<ReloadDocumentRequest, Document, KnowledgeOperationMetadata>
+      reloadDocumentOperationCallable;
 
   private final GrpcStubCallableFactory callableFactory;
 
@@ -285,6 +287,12 @@ public Map<String, String> extract(ReloadDocumentRequest request) {
     this.reloadDocumentCallable =
         callableFactory.createUnaryCallable(
             reloadDocumentTransportSettings, settings.reloadDocumentSettings(), clientContext);
+    this.reloadDocumentOperationCallable =
+        callableFactory.createOperationCallable(
+            reloadDocumentTransportSettings,
+            settings.reloadDocumentOperationSettings(),
+            clientContext,
+            this.operationsStub);
 
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
@@ -337,6 +345,12 @@ public UnaryCallable<UpdateDocumentRequest, Operation> updateDocumentCallable()
     return updateDocumentCallable;
   }
 
+  @BetaApi("The surface for use by generated code is not stable yet and may change in the future.")
+  public OperationCallable<ReloadDocumentRequest, Document, KnowledgeOperationMetadata>
+      reloadDocumentOperationCallable() {
+    return reloadDocumentOperationCallable;
+  }
+
   public UnaryCallable<ReloadDocumentRequest, Operation> reloadDocumentCallable() {
     return reloadDocumentCallable;
   }
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
index 84439f9bc..260cb5ca2 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/IntentsStubSettings.java
@@ -331,11 +331,17 @@ public static class Builder extends StubSettings.Builder<IntentsStubSettings, Bu
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -349,12 +355,44 @@ public static class Builder extends StubSettings.Builder<IntentsStubSettings, Bu
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
+              .build();
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(180000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(180000L))
+              .setTotalTimeout(Duration.ofMillis(180000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -409,45 +447,45 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .listIntentsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .getIntentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createIntentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .updateIntentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .deleteIntentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .batchUpdateIntentsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .batchDeleteIntentsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
       builder
           .batchUpdateIntentsOperationSettings()
           .setInitialCallSettings(
               UnaryCallSettings
                   .<BatchUpdateIntentsRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(
@@ -470,8 +508,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<BatchDeleteIntentsRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(Empty.class))
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/KnowledgeBasesStubSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/KnowledgeBasesStubSettings.java
index ab7641c48..c9429e13a 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/KnowledgeBasesStubSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/KnowledgeBasesStubSettings.java
@@ -296,11 +296,17 @@ public static class Builder extends StubSettings.Builder<KnowledgeBasesStubSetti
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -314,12 +320,44 @@ public static class Builder extends StubSettings.Builder<KnowledgeBasesStubSetti
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
+              .build();
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(180000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(180000L))
+              .setTotalTimeout(Duration.ofMillis(180000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -364,28 +402,28 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .listKnowledgeBasesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .getKnowledgeBaseSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createKnowledgeBaseSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .deleteKnowledgeBaseSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .updateKnowledgeBaseSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       return builder;
     }
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java
index 14d45c6ab..927426bee 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionEntityTypesStubSettings.java
@@ -316,11 +316,17 @@ public static class Builder
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -334,12 +340,44 @@ public static class Builder
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
+              .build();
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(180000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(180000L))
+              .setTotalTimeout(Duration.ofMillis(180000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -385,28 +423,28 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .listSessionEntityTypesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .getSessionEntityTypeSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createSessionEntityTypeSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .updateSessionEntityTypeSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .deleteSessionEntityTypeSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       return builder;
     }
diff --git a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStubSettings.java b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStubSettings.java
index 10e522356..b3f0c1e10 100644
--- a/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStubSettings.java
+++ b/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/SessionsStubSettings.java
@@ -189,11 +189,17 @@ public static class Builder extends StubSettings.Builder<SessionsStubSettings, B
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -207,12 +213,44 @@ public static class Builder extends StubSettings.Builder<SessionsStubSettings, B
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
+              .build();
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(180000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(180000L))
+              .setTotalTimeout(Duration.ofMillis(180000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(220000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(220000L))
+              .setTotalTimeout(Duration.ofMillis(220000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -246,8 +284,8 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .detectIntentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
 
       return builder;
     }
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java
index cde05a703..680b191b1 100644
--- a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java
+++ b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java
@@ -46,11 +46,11 @@
 
 @javax.annotation.Generated("by GAPIC")
 public class AgentsClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockAgents mockAgents;
   private static MockContexts mockContexts;
   private static MockDocuments mockDocuments;
   private static MockEntityTypes mockEntityTypes;
-  private static MockEnvironments mockEnvironments;
   private static MockIntents mockIntents;
   private static MockKnowledgeBases mockKnowledgeBases;
   private static MockSessionEntityTypes mockSessionEntityTypes;
@@ -61,11 +61,11 @@ public class AgentsClientTest {
 
   @BeforeClass
   public static void startStaticServer() {
+    mockEnvironments = new MockEnvironments();
     mockAgents = new MockAgents();
     mockContexts = new MockContexts();
     mockDocuments = new MockDocuments();
     mockEntityTypes = new MockEntityTypes();
-    mockEnvironments = new MockEnvironments();
     mockIntents = new MockIntents();
     mockKnowledgeBases = new MockKnowledgeBases();
     mockSessionEntityTypes = new MockSessionEntityTypes();
@@ -74,11 +74,11 @@ public static void startStaticServer() {
         new MockServiceHelper(
             UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
+                mockEnvironments,
                 mockAgents,
                 mockContexts,
                 mockDocuments,
                 mockEntityTypes,
-                mockEnvironments,
                 mockIntents,
                 mockKnowledgeBases,
                 mockSessionEntityTypes,
@@ -110,8 +110,8 @@ public void tearDown() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void setAgentTest() {
-    String parent = "parent-995424086";
+  public void getAgentTest() {
+    String parent2 = "parent21175163357";
     String displayName = "displayName1615086568";
     String defaultLanguageCode = "defaultLanguageCode856575222";
     String timeZone = "timeZone36848094";
@@ -121,7 +121,7 @@ public void setAgentTest() {
     float classificationThreshold = 1.11581064E8F;
     Agent expectedResponse =
         Agent.newBuilder()
-            .setParent(parent)
+            .setParent(parent2)
             .setDisplayName(displayName)
             .setDefaultLanguageCode(defaultLanguageCode)
             .setTimeZone(timeZone)
@@ -132,16 +132,16 @@ public void setAgentTest() {
             .build();
     mockAgents.addResponse(expectedResponse);
 
-    Agent agent = Agent.newBuilder().build();
+    ProjectName parent = ProjectName.of("[PROJECT]");
 
-    Agent actualResponse = client.setAgent(agent);
+    Agent actualResponse = client.getAgent(parent);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockAgents.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    SetAgentRequest actualRequest = (SetAgentRequest) actualRequests.get(0);
+    GetAgentRequest actualRequest = (GetAgentRequest) actualRequests.get(0);
 
-    Assert.assertEquals(agent, actualRequest.getAgent());
+    Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -150,14 +150,14 @@ public void setAgentTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void setAgentExceptionTest() throws Exception {
+  public void getAgentExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockAgents.addException(exception);
 
     try {
-      Agent agent = Agent.newBuilder().build();
+      ProjectName parent = ProjectName.of("[PROJECT]");
 
-      client.setAgent(agent);
+      client.getAgent(parent);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -166,19 +166,38 @@ public void setAgentExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteAgentTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
+  public void setAgentTest() {
+    String parent = "parent-995424086";
+    String displayName = "displayName1615086568";
+    String defaultLanguageCode = "defaultLanguageCode856575222";
+    String timeZone = "timeZone36848094";
+    String description = "description-1724546052";
+    String avatarUri = "avatarUri-402824826";
+    boolean enableLogging = false;
+    float classificationThreshold = 1.11581064E8F;
+    Agent expectedResponse =
+        Agent.newBuilder()
+            .setParent(parent)
+            .setDisplayName(displayName)
+            .setDefaultLanguageCode(defaultLanguageCode)
+            .setTimeZone(timeZone)
+            .setDescription(description)
+            .setAvatarUri(avatarUri)
+            .setEnableLogging(enableLogging)
+            .setClassificationThreshold(classificationThreshold)
+            .build();
     mockAgents.addResponse(expectedResponse);
 
-    ProjectName parent = ProjectName.of("[PROJECT]");
+    Agent agent = Agent.newBuilder().build();
 
-    client.deleteAgent(parent);
+    Agent actualResponse = client.setAgent(agent);
+    Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockAgents.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    DeleteAgentRequest actualRequest = (DeleteAgentRequest) actualRequests.get(0);
+    SetAgentRequest actualRequest = (SetAgentRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent()));
+    Assert.assertEquals(agent, actualRequest.getAgent());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -187,14 +206,14 @@ public void deleteAgentTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void deleteAgentExceptionTest() throws Exception {
+  public void setAgentExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockAgents.addException(exception);
 
     try {
-      ProjectName parent = ProjectName.of("[PROJECT]");
+      Agent agent = Agent.newBuilder().build();
 
-      client.deleteAgent(parent);
+      client.setAgent(agent);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -203,36 +222,17 @@ public void deleteAgentExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void getAgentTest() {
-    String parent2 = "parent21175163357";
-    String displayName = "displayName1615086568";
-    String defaultLanguageCode = "defaultLanguageCode856575222";
-    String timeZone = "timeZone36848094";
-    String description = "description-1724546052";
-    String avatarUri = "avatarUri-402824826";
-    boolean enableLogging = false;
-    float classificationThreshold = 1.11581064E8F;
-    Agent expectedResponse =
-        Agent.newBuilder()
-            .setParent(parent2)
-            .setDisplayName(displayName)
-            .setDefaultLanguageCode(defaultLanguageCode)
-            .setTimeZone(timeZone)
-            .setDescription(description)
-            .setAvatarUri(avatarUri)
-            .setEnableLogging(enableLogging)
-            .setClassificationThreshold(classificationThreshold)
-            .build();
+  public void deleteAgentTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
     mockAgents.addResponse(expectedResponse);
 
     ProjectName parent = ProjectName.of("[PROJECT]");
 
-    Agent actualResponse = client.getAgent(parent);
-    Assert.assertEquals(expectedResponse, actualResponse);
+    client.deleteAgent(parent);
 
     List<AbstractMessage> actualRequests = mockAgents.getRequests();
     Assert.assertEquals(1, actualRequests.size());
-    GetAgentRequest actualRequest = (GetAgentRequest) actualRequests.get(0);
+    DeleteAgentRequest actualRequest = (DeleteAgentRequest) actualRequests.get(0);
 
     Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent()));
     Assert.assertTrue(
@@ -243,14 +243,14 @@ public void getAgentTest() {
 
   @Test
   @SuppressWarnings("all")
-  public void getAgentExceptionTest() throws Exception {
+  public void deleteAgentExceptionTest() throws Exception {
     StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
     mockAgents.addException(exception);
 
     try {
       ProjectName parent = ProjectName.of("[PROJECT]");
 
-      client.getAgent(parent);
+      client.deleteAgent(parent);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -505,7 +505,9 @@ public void getValidationResultTest() {
     ValidationResult expectedResponse = ValidationResult.newBuilder().build();
     mockAgents.addResponse(expectedResponse);
 
-    GetValidationResultRequest request = GetValidationResultRequest.newBuilder().build();
+    ProjectName parent = ProjectName.of("[PROJECT]");
+    GetValidationResultRequest request =
+        GetValidationResultRequest.newBuilder().setParent(parent.toString()).build();
 
     ValidationResult actualResponse = client.getValidationResult(request);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -514,6 +516,7 @@ public void getValidationResultTest() {
     Assert.assertEquals(1, actualRequests.size());
     GetValidationResultRequest actualRequest = (GetValidationResultRequest) actualRequests.get(0);
 
+    Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -527,7 +530,9 @@ public void getValidationResultExceptionTest() throws Exception {
     mockAgents.addException(exception);
 
     try {
-      GetValidationResultRequest request = GetValidationResultRequest.newBuilder().build();
+      ProjectName parent = ProjectName.of("[PROJECT]");
+      GetValidationResultRequest request =
+          GetValidationResultRequest.newBuilder().setParent(parent.toString()).build();
 
       client.getValidationResult(request);
       Assert.fail("No exception raised");
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java
index b106d7e2a..faf684e11 100644
--- a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java
+++ b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/ContextsClientTest.java
@@ -27,6 +27,7 @@
 import com.google.common.collect.Lists;
 import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import java.io.IOException;
@@ -42,11 +43,11 @@
 
 @javax.annotation.Generated("by GAPIC")
 public class ContextsClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockAgents mockAgents;
   private static MockContexts mockContexts;
   private static MockDocuments mockDocuments;
   private static MockEntityTypes mockEntityTypes;
-  private static MockEnvironments mockEnvironments;
   private static MockIntents mockIntents;
   private static MockKnowledgeBases mockKnowledgeBases;
   private static MockSessionEntityTypes mockSessionEntityTypes;
@@ -57,11 +58,11 @@ public class ContextsClientTest {
 
   @BeforeClass
   public static void startStaticServer() {
+    mockEnvironments = new MockEnvironments();
     mockAgents = new MockAgents();
     mockContexts = new MockContexts();
     mockDocuments = new MockDocuments();
     mockEntityTypes = new MockEntityTypes();
-    mockEnvironments = new MockEnvironments();
     mockIntents = new MockIntents();
     mockKnowledgeBases = new MockKnowledgeBases();
     mockSessionEntityTypes = new MockSessionEntityTypes();
@@ -70,11 +71,11 @@ public static void startStaticServer() {
         new MockServiceHelper(
             UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
+                mockEnvironments,
                 mockAgents,
                 mockContexts,
                 mockDocuments,
                 mockEntityTypes,
-                mockEnvironments,
                 mockIntents,
                 mockKnowledgeBases,
                 mockSessionEntityTypes,
@@ -117,7 +118,7 @@ public void listContextsTest() {
             .build();
     mockContexts.addResponse(expectedResponse);
 
-    SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+    SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
 
     ListContextsPagedResponse pagedListResponse = client.listContexts(parent);
 
@@ -143,7 +144,7 @@ public void listContextsExceptionTest() throws Exception {
     mockContexts.addException(exception);
 
     try {
-      SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+      SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
 
       client.listContexts(parent);
       Assert.fail("No exception raised");
@@ -155,13 +156,15 @@ public void listContextsExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void getContextTest() {
-    ContextName name2 = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+    ContextName name2 =
+        ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
     int lifespanCount = 1178775510;
     Context expectedResponse =
         Context.newBuilder().setName(name2.toString()).setLifespanCount(lifespanCount).build();
     mockContexts.addResponse(expectedResponse);
 
-    ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+    ContextName name =
+        ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
 
     Context actualResponse = client.getContext(name);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -184,7 +187,8 @@ public void getContextExceptionTest() throws Exception {
     mockContexts.addException(exception);
 
     try {
-      ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+      ContextName name =
+          ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
 
       client.getContext(name);
       Assert.fail("No exception raised");
@@ -196,13 +200,14 @@ public void getContextExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void createContextTest() {
-    ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+    ContextName name =
+        ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
     int lifespanCount = 1178775510;
     Context expectedResponse =
         Context.newBuilder().setName(name.toString()).setLifespanCount(lifespanCount).build();
     mockContexts.addResponse(expectedResponse);
 
-    SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+    SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
     Context context = Context.newBuilder().build();
 
     Context actualResponse = client.createContext(parent, context);
@@ -227,7 +232,7 @@ public void createContextExceptionTest() throws Exception {
     mockContexts.addException(exception);
 
     try {
-      SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+      SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
       Context context = Context.newBuilder().build();
 
       client.createContext(parent, context);
@@ -240,15 +245,17 @@ public void createContextExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateContextTest() {
-    ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+    ContextName name =
+        ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
     int lifespanCount = 1178775510;
     Context expectedResponse =
         Context.newBuilder().setName(name.toString()).setLifespanCount(lifespanCount).build();
     mockContexts.addResponse(expectedResponse);
 
     Context context = Context.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
 
-    Context actualResponse = client.updateContext(context);
+    Context actualResponse = client.updateContext(context, updateMask);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockContexts.getRequests();
@@ -256,6 +263,7 @@ public void updateContextTest() {
     UpdateContextRequest actualRequest = (UpdateContextRequest) actualRequests.get(0);
 
     Assert.assertEquals(context, actualRequest.getContext());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -270,8 +278,54 @@ public void updateContextExceptionTest() throws Exception {
 
     try {
       Context context = Context.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
+
+      client.updateContext(context, updateMask);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateContextTest2() {
+    ContextName name =
+        ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
+    int lifespanCount = 1178775510;
+    Context expectedResponse =
+        Context.newBuilder().setName(name.toString()).setLifespanCount(lifespanCount).build();
+    mockContexts.addResponse(expectedResponse);
+
+    Context context = Context.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
+
+    Context actualResponse = client.updateContext(context, updateMask);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockContexts.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateContextRequest actualRequest = (UpdateContextRequest) actualRequests.get(0);
+
+    Assert.assertEquals(context, actualRequest.getContext());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateContextExceptionTest2() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockContexts.addException(exception);
+
+    try {
+      Context context = Context.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
 
-      client.updateContext(context);
+      client.updateContext(context, updateMask);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -284,7 +338,8 @@ public void deleteContextTest() {
     Empty expectedResponse = Empty.newBuilder().build();
     mockContexts.addResponse(expectedResponse);
 
-    ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+    ContextName name =
+        ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
 
     client.deleteContext(name);
 
@@ -306,7 +361,8 @@ public void deleteContextExceptionTest() throws Exception {
     mockContexts.addException(exception);
 
     try {
-      ContextName name = ContextName.of("[PROJECT]", "[SESSION]", "[CONTEXT]");
+      ContextName name =
+          ContextName.ofProjectSessionContextName("[PROJECT]", "[SESSION]", "[CONTEXT]");
 
       client.deleteContext(name);
       Assert.fail("No exception raised");
@@ -321,7 +377,7 @@ public void deleteAllContextsTest() {
     Empty expectedResponse = Empty.newBuilder().build();
     mockContexts.addResponse(expectedResponse);
 
-    SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+    SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
 
     client.deleteAllContexts(parent);
 
@@ -343,7 +399,7 @@ public void deleteAllContextsExceptionTest() throws Exception {
     mockContexts.addException(exception);
 
     try {
-      SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+      SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
 
       client.deleteAllContexts(parent);
       Assert.fail("No exception raised");
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java
index 72c7cf9ed..f6e2fbd9d 100644
--- a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java
+++ b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/DocumentsClientTest.java
@@ -30,6 +30,7 @@
 import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Any;
 import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import java.io.IOException;
@@ -46,11 +47,11 @@
 
 @javax.annotation.Generated("by GAPIC")
 public class DocumentsClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockAgents mockAgents;
   private static MockContexts mockContexts;
   private static MockDocuments mockDocuments;
   private static MockEntityTypes mockEntityTypes;
-  private static MockEnvironments mockEnvironments;
   private static MockIntents mockIntents;
   private static MockKnowledgeBases mockKnowledgeBases;
   private static MockSessionEntityTypes mockSessionEntityTypes;
@@ -61,11 +62,11 @@ public class DocumentsClientTest {
 
   @BeforeClass
   public static void startStaticServer() {
+    mockEnvironments = new MockEnvironments();
     mockAgents = new MockAgents();
     mockContexts = new MockContexts();
     mockDocuments = new MockDocuments();
     mockEntityTypes = new MockEntityTypes();
-    mockEnvironments = new MockEnvironments();
     mockIntents = new MockIntents();
     mockKnowledgeBases = new MockKnowledgeBases();
     mockSessionEntityTypes = new MockSessionEntityTypes();
@@ -74,11 +75,11 @@ public static void startStaticServer() {
         new MockServiceHelper(
             UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
+                mockEnvironments,
                 mockAgents,
                 mockContexts,
                 mockDocuments,
                 mockEntityTypes,
-                mockEnvironments,
                 mockIntents,
                 mockKnowledgeBases,
                 mockSessionEntityTypes,
@@ -338,8 +339,9 @@ public void updateDocumentTest() throws Exception {
     mockDocuments.addResponse(resultOperation);
 
     Document document = Document.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
 
-    Document actualResponse = client.updateDocumentAsync(document).get();
+    Document actualResponse = client.updateDocumentAsync(document, updateMask).get();
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDocuments.getRequests();
@@ -347,6 +349,7 @@ public void updateDocumentTest() throws Exception {
     UpdateDocumentRequest actualRequest = (UpdateDocumentRequest) actualRequests.get(0);
 
     Assert.assertEquals(document, actualRequest.getDocument());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -361,8 +364,9 @@ public void updateDocumentExceptionTest() throws Exception {
 
     try {
       Document document = Document.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
 
-      client.updateDocumentAsync(document).get();
+      client.updateDocumentAsync(document, updateMask).get();
       Assert.fail("No exception raised");
     } catch (ExecutionException e) {
       Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
@@ -373,21 +377,101 @@ public void updateDocumentExceptionTest() throws Exception {
 
   @Test
   @SuppressWarnings("all")
-  public void reloadDocumentTest() {
-    String name = "name3373707";
-    boolean done = true;
-    Operation expectedResponse = Operation.newBuilder().setName(name).setDone(done).build();
-    mockDocuments.addResponse(expectedResponse);
+  public void updateDocumentTest2() throws Exception {
+    DocumentName name = DocumentName.of("[PROJECT]", "[KNOWLEDGE_BASE]", "[DOCUMENT]");
+    String displayName = "displayName1615086568";
+    String mimeType = "mimeType-196041627";
+    String contentUri = "contentUri-388807514";
+    boolean enableAutoReload = false;
+    Document expectedResponse =
+        Document.newBuilder()
+            .setName(name.toString())
+            .setDisplayName(displayName)
+            .setMimeType(mimeType)
+            .setContentUri(contentUri)
+            .setEnableAutoReload(enableAutoReload)
+            .build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("updateDocumentTest2")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockDocuments.addResponse(resultOperation);
+
+    Document document = Document.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
+
+    Document actualResponse = client.updateDocumentAsync(document, updateMask).get();
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockDocuments.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateDocumentRequest actualRequest = (UpdateDocumentRequest) actualRequests.get(0);
+
+    Assert.assertEquals(document, actualRequest.getDocument());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateDocumentExceptionTest2() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockDocuments.addException(exception);
+
+    try {
+      Document document = Document.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
+
+      client.updateDocumentAsync(document, updateMask).get();
+      Assert.fail("No exception raised");
+    } catch (ExecutionException e) {
+      Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
+      InvalidArgumentException apiException = (InvalidArgumentException) e.getCause();
+      Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void reloadDocumentTest() throws Exception {
+    DocumentName name2 = DocumentName.of("[PROJECT]", "[KNOWLEDGE_BASE]", "[DOCUMENT]");
+    String displayName = "displayName1615086568";
+    String mimeType = "mimeType-196041627";
+    String contentUri = "contentUri-388807514";
+    boolean enableAutoReload = false;
+    Document expectedResponse =
+        Document.newBuilder()
+            .setName(name2.toString())
+            .setDisplayName(displayName)
+            .setMimeType(mimeType)
+            .setContentUri(contentUri)
+            .setEnableAutoReload(enableAutoReload)
+            .build();
+    Operation resultOperation =
+        Operation.newBuilder()
+            .setName("reloadDocumentTest")
+            .setDone(true)
+            .setResponse(Any.pack(expectedResponse))
+            .build();
+    mockDocuments.addResponse(resultOperation);
 
-    ReloadDocumentRequest request = ReloadDocumentRequest.newBuilder().build();
+    DocumentName name = DocumentName.of("[PROJECT]", "[KNOWLEDGE_BASE]", "[DOCUMENT]");
+    ReloadDocumentRequest request =
+        ReloadDocumentRequest.newBuilder().setName(name.toString()).build();
 
-    Operation actualResponse = client.reloadDocument(request);
+    Document actualResponse = client.reloadDocumentAsync(request).get();
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockDocuments.getRequests();
     Assert.assertEquals(1, actualRequests.size());
     ReloadDocumentRequest actualRequest = (ReloadDocumentRequest) actualRequests.get(0);
 
+    Assert.assertEquals(name, DocumentName.parse(actualRequest.getName()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -401,12 +485,16 @@ public void reloadDocumentExceptionTest() throws Exception {
     mockDocuments.addException(exception);
 
     try {
-      ReloadDocumentRequest request = ReloadDocumentRequest.newBuilder().build();
+      DocumentName name = DocumentName.of("[PROJECT]", "[KNOWLEDGE_BASE]", "[DOCUMENT]");
+      ReloadDocumentRequest request =
+          ReloadDocumentRequest.newBuilder().setName(name.toString()).build();
 
-      client.reloadDocument(request);
+      client.reloadDocumentAsync(request).get();
       Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
+    } catch (ExecutionException e) {
+      Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass());
+      InvalidArgumentException apiException = (InvalidArgumentException) e.getCause();
+      Assert.assertEquals(StatusCode.Code.INVALID_ARGUMENT, apiException.getStatusCode().getCode());
     }
   }
 }
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java
index 2328e49b9..5fb49fecc 100644
--- a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java
+++ b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EntityTypesClientTest.java
@@ -47,11 +47,11 @@
 
 @javax.annotation.Generated("by GAPIC")
 public class EntityTypesClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockAgents mockAgents;
   private static MockContexts mockContexts;
   private static MockDocuments mockDocuments;
   private static MockEntityTypes mockEntityTypes;
-  private static MockEnvironments mockEnvironments;
   private static MockIntents mockIntents;
   private static MockKnowledgeBases mockKnowledgeBases;
   private static MockSessionEntityTypes mockSessionEntityTypes;
@@ -62,11 +62,11 @@ public class EntityTypesClientTest {
 
   @BeforeClass
   public static void startStaticServer() {
+    mockEnvironments = new MockEnvironments();
     mockAgents = new MockAgents();
     mockContexts = new MockContexts();
     mockDocuments = new MockDocuments();
     mockEntityTypes = new MockEntityTypes();
-    mockEnvironments = new MockEnvironments();
     mockIntents = new MockIntents();
     mockKnowledgeBases = new MockKnowledgeBases();
     mockSessionEntityTypes = new MockSessionEntityTypes();
@@ -75,11 +75,11 @@ public static void startStaticServer() {
         new MockServiceHelper(
             UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
+                mockEnvironments,
                 mockAgents,
                 mockContexts,
                 mockDocuments,
                 mockEntityTypes,
-                mockEnvironments,
                 mockIntents,
                 mockKnowledgeBases,
                 mockSessionEntityTypes,
@@ -122,7 +122,7 @@ public void listEntityTypesTest() {
             .build();
     mockEntityTypes.addResponse(expectedResponse);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
 
     ListEntityTypesPagedResponse pagedListResponse = client.listEntityTypes(parent);
 
@@ -134,7 +134,7 @@ public void listEntityTypesTest() {
     Assert.assertEquals(1, actualRequests.size());
     ListEntityTypesRequest actualRequest = (ListEntityTypesRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -148,7 +148,7 @@ public void listEntityTypesExceptionTest() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
 
       client.listEntityTypes(parent);
       Assert.fail("No exception raised");
@@ -170,7 +170,7 @@ public void listEntityTypesTest2() {
             .build();
     mockEntityTypes.addResponse(expectedResponse);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
     String languageCode = "languageCode-412800396";
 
     ListEntityTypesPagedResponse pagedListResponse = client.listEntityTypes(parent, languageCode);
@@ -183,7 +183,7 @@ public void listEntityTypesTest2() {
     Assert.assertEquals(1, actualRequests.size());
     ListEntityTypesRequest actualRequest = (ListEntityTypesRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertEquals(languageCode, actualRequest.getLanguageCode());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -198,7 +198,7 @@ public void listEntityTypesExceptionTest2() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
       String languageCode = "languageCode-412800396";
 
       client.listEntityTypes(parent, languageCode);
@@ -211,7 +211,7 @@ public void listEntityTypesExceptionTest2() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void getEntityTypeTest() {
-    EntityTypeName name2 = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName name2 = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     String displayName = "displayName1615086568";
     boolean enableFuzzyExtraction = true;
     EntityType expectedResponse =
@@ -222,7 +222,7 @@ public void getEntityTypeTest() {
             .build();
     mockEntityTypes.addResponse(expectedResponse);
 
-    EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
 
     EntityType actualResponse = client.getEntityType(name);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -245,7 +245,7 @@ public void getEntityTypeExceptionTest() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+      EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
 
       client.getEntityType(name);
       Assert.fail("No exception raised");
@@ -257,7 +257,7 @@ public void getEntityTypeExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void getEntityTypeTest2() {
-    EntityTypeName name2 = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName name2 = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     String displayName = "displayName1615086568";
     boolean enableFuzzyExtraction = true;
     EntityType expectedResponse =
@@ -268,7 +268,7 @@ public void getEntityTypeTest2() {
             .build();
     mockEntityTypes.addResponse(expectedResponse);
 
-    EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     String languageCode = "languageCode-412800396";
 
     EntityType actualResponse = client.getEntityType(name, languageCode);
@@ -293,7 +293,7 @@ public void getEntityTypeExceptionTest2() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+      EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
       String languageCode = "languageCode-412800396";
 
       client.getEntityType(name, languageCode);
@@ -306,7 +306,7 @@ public void getEntityTypeExceptionTest2() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void createEntityTypeTest() {
-    EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     String displayName = "displayName1615086568";
     boolean enableFuzzyExtraction = true;
     EntityType expectedResponse =
@@ -317,7 +317,7 @@ public void createEntityTypeTest() {
             .build();
     mockEntityTypes.addResponse(expectedResponse);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
     EntityType entityType = EntityType.newBuilder().build();
 
     EntityType actualResponse = client.createEntityType(parent, entityType);
@@ -327,7 +327,7 @@ public void createEntityTypeTest() {
     Assert.assertEquals(1, actualRequests.size());
     CreateEntityTypeRequest actualRequest = (CreateEntityTypeRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertEquals(entityType, actualRequest.getEntityType());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -342,7 +342,7 @@ public void createEntityTypeExceptionTest() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
       EntityType entityType = EntityType.newBuilder().build();
 
       client.createEntityType(parent, entityType);
@@ -355,7 +355,7 @@ public void createEntityTypeExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void createEntityTypeTest2() {
-    EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     String displayName = "displayName1615086568";
     boolean enableFuzzyExtraction = true;
     EntityType expectedResponse =
@@ -366,7 +366,7 @@ public void createEntityTypeTest2() {
             .build();
     mockEntityTypes.addResponse(expectedResponse);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
     EntityType entityType = EntityType.newBuilder().build();
     String languageCode = "languageCode-412800396";
 
@@ -377,7 +377,7 @@ public void createEntityTypeTest2() {
     Assert.assertEquals(1, actualRequests.size());
     CreateEntityTypeRequest actualRequest = (CreateEntityTypeRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertEquals(entityType, actualRequest.getEntityType());
     Assert.assertEquals(languageCode, actualRequest.getLanguageCode());
     Assert.assertTrue(
@@ -393,7 +393,7 @@ public void createEntityTypeExceptionTest2() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
       EntityType entityType = EntityType.newBuilder().build();
       String languageCode = "languageCode-412800396";
 
@@ -407,7 +407,7 @@ public void createEntityTypeExceptionTest2() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateEntityTypeTest() {
-    EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     String displayName = "displayName1615086568";
     boolean enableFuzzyExtraction = true;
     EntityType expectedResponse =
@@ -453,7 +453,7 @@ public void updateEntityTypeExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateEntityTypeTest2() {
-    EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     String displayName = "displayName1615086568";
     boolean enableFuzzyExtraction = true;
     EntityType expectedResponse =
@@ -496,13 +496,59 @@ public void updateEntityTypeExceptionTest2() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void updateEntityTypeTest3() {
+    EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
+    String displayName = "displayName1615086568";
+    boolean enableFuzzyExtraction = true;
+    EntityType expectedResponse =
+        EntityType.newBuilder()
+            .setName(name.toString())
+            .setDisplayName(displayName)
+            .setEnableFuzzyExtraction(enableFuzzyExtraction)
+            .build();
+    mockEntityTypes.addResponse(expectedResponse);
+
+    EntityType entityType = EntityType.newBuilder().build();
+
+    EntityType actualResponse = client.updateEntityType(entityType);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockEntityTypes.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateEntityTypeRequest actualRequest = (UpdateEntityTypeRequest) actualRequests.get(0);
+
+    Assert.assertEquals(entityType, actualRequest.getEntityType());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateEntityTypeExceptionTest3() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockEntityTypes.addException(exception);
+
+    try {
+      EntityType entityType = EntityType.newBuilder().build();
+
+      client.updateEntityType(entityType);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void deleteEntityTypeTest() {
     Empty expectedResponse = Empty.newBuilder().build();
     mockEntityTypes.addResponse(expectedResponse);
 
-    EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
 
     client.deleteEntityType(name);
 
@@ -524,7 +570,7 @@ public void deleteEntityTypeExceptionTest() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      EntityTypeName name = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+      EntityTypeName name = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
 
       client.deleteEntityType(name);
       Assert.fail("No exception raised");
@@ -546,7 +592,7 @@ public void batchUpdateEntityTypesTest() throws Exception {
             .build();
     mockEntityTypes.addResponse(resultOperation);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
     BatchUpdateEntityTypesRequest request =
         BatchUpdateEntityTypesRequest.newBuilder().setParent(parent.toString()).build();
 
@@ -559,7 +605,7 @@ public void batchUpdateEntityTypesTest() throws Exception {
     BatchUpdateEntityTypesRequest actualRequest =
         (BatchUpdateEntityTypesRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -573,7 +619,7 @@ public void batchUpdateEntityTypesExceptionTest() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
       BatchUpdateEntityTypesRequest request =
           BatchUpdateEntityTypesRequest.newBuilder().setParent(parent.toString()).build();
 
@@ -598,7 +644,7 @@ public void batchDeleteEntityTypesTest() throws Exception {
             .build();
     mockEntityTypes.addResponse(resultOperation);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
     List<String> entityTypeNames = new ArrayList<>();
 
     Empty actualResponse = client.batchDeleteEntityTypesAsync(parent, entityTypeNames).get();
@@ -609,7 +655,7 @@ public void batchDeleteEntityTypesTest() throws Exception {
     BatchDeleteEntityTypesRequest actualRequest =
         (BatchDeleteEntityTypesRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertEquals(entityTypeNames, actualRequest.getEntityTypeNamesList());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -624,7 +670,7 @@ public void batchDeleteEntityTypesExceptionTest() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
       List<String> entityTypeNames = new ArrayList<>();
 
       client.batchDeleteEntityTypesAsync(parent, entityTypeNames).get();
@@ -648,7 +694,7 @@ public void batchCreateEntitiesTest() throws Exception {
             .build();
     mockEntityTypes.addResponse(resultOperation);
 
-    EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     List<EntityType.Entity> entities = new ArrayList<>();
 
     Empty actualResponse = client.batchCreateEntitiesAsync(parent, entities).get();
@@ -673,7 +719,7 @@ public void batchCreateEntitiesExceptionTest() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+      EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
       List<EntityType.Entity> entities = new ArrayList<>();
 
       client.batchCreateEntitiesAsync(parent, entities).get();
@@ -697,7 +743,7 @@ public void batchCreateEntitiesTest2() throws Exception {
             .build();
     mockEntityTypes.addResponse(resultOperation);
 
-    EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     List<EntityType.Entity> entities = new ArrayList<>();
     String languageCode = "languageCode-412800396";
 
@@ -724,7 +770,7 @@ public void batchCreateEntitiesExceptionTest2() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+      EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
       List<EntityType.Entity> entities = new ArrayList<>();
       String languageCode = "languageCode-412800396";
 
@@ -749,7 +795,7 @@ public void batchUpdateEntitiesTest() throws Exception {
             .build();
     mockEntityTypes.addResponse(resultOperation);
 
-    EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     List<EntityType.Entity> entities = new ArrayList<>();
 
     Empty actualResponse = client.batchUpdateEntitiesAsync(parent, entities).get();
@@ -774,7 +820,7 @@ public void batchUpdateEntitiesExceptionTest() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+      EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
       List<EntityType.Entity> entities = new ArrayList<>();
 
       client.batchUpdateEntitiesAsync(parent, entities).get();
@@ -798,7 +844,7 @@ public void batchUpdateEntitiesTest2() throws Exception {
             .build();
     mockEntityTypes.addResponse(resultOperation);
 
-    EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     List<EntityType.Entity> entities = new ArrayList<>();
     String languageCode = "languageCode-412800396";
 
@@ -825,7 +871,7 @@ public void batchUpdateEntitiesExceptionTest2() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+      EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
       List<EntityType.Entity> entities = new ArrayList<>();
       String languageCode = "languageCode-412800396";
 
@@ -850,7 +896,7 @@ public void batchDeleteEntitiesTest() throws Exception {
             .build();
     mockEntityTypes.addResponse(resultOperation);
 
-    EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     List<String> entityValues = new ArrayList<>();
 
     Empty actualResponse = client.batchDeleteEntitiesAsync(parent, entityValues).get();
@@ -875,7 +921,7 @@ public void batchDeleteEntitiesExceptionTest() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+      EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
       List<String> entityValues = new ArrayList<>();
 
       client.batchDeleteEntitiesAsync(parent, entityValues).get();
@@ -899,7 +945,7 @@ public void batchDeleteEntitiesTest2() throws Exception {
             .build();
     mockEntityTypes.addResponse(resultOperation);
 
-    EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+    EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
     List<String> entityValues = new ArrayList<>();
     String languageCode = "languageCode-412800396";
 
@@ -927,7 +973,7 @@ public void batchDeleteEntitiesExceptionTest2() throws Exception {
     mockEntityTypes.addException(exception);
 
     try {
-      EntityTypeName parent = EntityTypeName.of("[PROJECT]", "[ENTITY_TYPE]");
+      EntityTypeName parent = EntityTypeName.ofProjectEntityTypeName("[PROJECT]", "[ENTITY_TYPE]");
       List<String> entityValues = new ArrayList<>();
       String languageCode = "languageCode-412800396";
 
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EnvironmentsClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EnvironmentsClientTest.java
index e193df425..05fc48172 100644
--- a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EnvironmentsClientTest.java
+++ b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/EnvironmentsClientTest.java
@@ -41,11 +41,11 @@
 
 @javax.annotation.Generated("by GAPIC")
 public class EnvironmentsClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockAgents mockAgents;
   private static MockContexts mockContexts;
   private static MockDocuments mockDocuments;
   private static MockEntityTypes mockEntityTypes;
-  private static MockEnvironments mockEnvironments;
   private static MockIntents mockIntents;
   private static MockKnowledgeBases mockKnowledgeBases;
   private static MockSessionEntityTypes mockSessionEntityTypes;
@@ -56,11 +56,11 @@ public class EnvironmentsClientTest {
 
   @BeforeClass
   public static void startStaticServer() {
+    mockEnvironments = new MockEnvironments();
     mockAgents = new MockAgents();
     mockContexts = new MockContexts();
     mockDocuments = new MockDocuments();
     mockEntityTypes = new MockEntityTypes();
-    mockEnvironments = new MockEnvironments();
     mockIntents = new MockIntents();
     mockKnowledgeBases = new MockKnowledgeBases();
     mockSessionEntityTypes = new MockSessionEntityTypes();
@@ -69,11 +69,11 @@ public static void startStaticServer() {
         new MockServiceHelper(
             UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
+                mockEnvironments,
                 mockAgents,
                 mockContexts,
                 mockDocuments,
                 mockEntityTypes,
-                mockEnvironments,
                 mockIntents,
                 mockKnowledgeBases,
                 mockSessionEntityTypes,
@@ -116,7 +116,7 @@ public void listEnvironmentsTest() {
             .build();
     mockEnvironments.addResponse(expectedResponse);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
 
     ListEnvironmentsPagedResponse pagedListResponse = client.listEnvironments(parent);
 
@@ -128,7 +128,7 @@ public void listEnvironmentsTest() {
     Assert.assertEquals(1, actualRequests.size());
     ListEnvironmentsRequest actualRequest = (ListEnvironmentsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -142,7 +142,7 @@ public void listEnvironmentsExceptionTest() throws Exception {
     mockEnvironments.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
 
       client.listEnvironments(parent);
       Assert.fail("No exception raised");
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java
index f39f71892..d355c67bc 100644
--- a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java
+++ b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/IntentsClientTest.java
@@ -30,6 +30,7 @@
 import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Any;
 import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import java.io.IOException;
@@ -47,11 +48,11 @@
 
 @javax.annotation.Generated("by GAPIC")
 public class IntentsClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockAgents mockAgents;
   private static MockContexts mockContexts;
   private static MockDocuments mockDocuments;
   private static MockEntityTypes mockEntityTypes;
-  private static MockEnvironments mockEnvironments;
   private static MockIntents mockIntents;
   private static MockKnowledgeBases mockKnowledgeBases;
   private static MockSessionEntityTypes mockSessionEntityTypes;
@@ -62,11 +63,11 @@ public class IntentsClientTest {
 
   @BeforeClass
   public static void startStaticServer() {
+    mockEnvironments = new MockEnvironments();
     mockAgents = new MockAgents();
     mockContexts = new MockContexts();
     mockDocuments = new MockDocuments();
     mockEntityTypes = new MockEntityTypes();
-    mockEnvironments = new MockEnvironments();
     mockIntents = new MockIntents();
     mockKnowledgeBases = new MockKnowledgeBases();
     mockSessionEntityTypes = new MockSessionEntityTypes();
@@ -75,11 +76,11 @@ public static void startStaticServer() {
         new MockServiceHelper(
             UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
+                mockEnvironments,
                 mockAgents,
                 mockContexts,
                 mockDocuments,
                 mockEntityTypes,
-                mockEnvironments,
                 mockIntents,
                 mockKnowledgeBases,
                 mockSessionEntityTypes,
@@ -122,7 +123,7 @@ public void listIntentsTest() {
             .build();
     mockIntents.addResponse(expectedResponse);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
 
     ListIntentsPagedResponse pagedListResponse = client.listIntents(parent);
 
@@ -134,7 +135,7 @@ public void listIntentsTest() {
     Assert.assertEquals(1, actualRequests.size());
     ListIntentsRequest actualRequest = (ListIntentsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -148,7 +149,7 @@ public void listIntentsExceptionTest() throws Exception {
     mockIntents.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
 
       client.listIntents(parent);
       Assert.fail("No exception raised");
@@ -170,7 +171,7 @@ public void listIntentsTest2() {
             .build();
     mockIntents.addResponse(expectedResponse);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
     String languageCode = "languageCode-412800396";
 
     ListIntentsPagedResponse pagedListResponse = client.listIntents(parent, languageCode);
@@ -183,7 +184,7 @@ public void listIntentsTest2() {
     Assert.assertEquals(1, actualRequests.size());
     ListIntentsRequest actualRequest = (ListIntentsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertEquals(languageCode, actualRequest.getLanguageCode());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -198,7 +199,7 @@ public void listIntentsExceptionTest2() throws Exception {
     mockIntents.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
       String languageCode = "languageCode-412800396";
 
       client.listIntents(parent, languageCode);
@@ -211,7 +212,7 @@ public void listIntentsExceptionTest2() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void getIntentTest() {
-    IntentName name2 = IntentName.of("[PROJECT]", "[INTENT]");
+    IntentName name2 = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
     String displayName = "displayName1615086568";
     int priority = 1165461084;
     boolean isFallback = false;
@@ -238,7 +239,7 @@ public void getIntentTest() {
             .build();
     mockIntents.addResponse(expectedResponse);
 
-    IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+    IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
 
     Intent actualResponse = client.getIntent(name);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -261,7 +262,7 @@ public void getIntentExceptionTest() throws Exception {
     mockIntents.addException(exception);
 
     try {
-      IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+      IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
 
       client.getIntent(name);
       Assert.fail("No exception raised");
@@ -273,7 +274,7 @@ public void getIntentExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void getIntentTest2() {
-    IntentName name2 = IntentName.of("[PROJECT]", "[INTENT]");
+    IntentName name2 = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
     String displayName = "displayName1615086568";
     int priority = 1165461084;
     boolean isFallback = false;
@@ -300,7 +301,7 @@ public void getIntentTest2() {
             .build();
     mockIntents.addResponse(expectedResponse);
 
-    IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+    IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
     String languageCode = "languageCode-412800396";
 
     Intent actualResponse = client.getIntent(name, languageCode);
@@ -325,7 +326,7 @@ public void getIntentExceptionTest2() throws Exception {
     mockIntents.addException(exception);
 
     try {
-      IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+      IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
       String languageCode = "languageCode-412800396";
 
       client.getIntent(name, languageCode);
@@ -338,7 +339,7 @@ public void getIntentExceptionTest2() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void createIntentTest() {
-    IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+    IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
     String displayName = "displayName1615086568";
     int priority = 1165461084;
     boolean isFallback = false;
@@ -365,7 +366,7 @@ public void createIntentTest() {
             .build();
     mockIntents.addResponse(expectedResponse);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
     Intent intent = Intent.newBuilder().build();
 
     Intent actualResponse = client.createIntent(parent, intent);
@@ -375,7 +376,7 @@ public void createIntentTest() {
     Assert.assertEquals(1, actualRequests.size());
     CreateIntentRequest actualRequest = (CreateIntentRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertEquals(intent, actualRequest.getIntent());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -390,7 +391,7 @@ public void createIntentExceptionTest() throws Exception {
     mockIntents.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
       Intent intent = Intent.newBuilder().build();
 
       client.createIntent(parent, intent);
@@ -403,7 +404,7 @@ public void createIntentExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void createIntentTest2() {
-    IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+    IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
     String displayName = "displayName1615086568";
     int priority = 1165461084;
     boolean isFallback = false;
@@ -430,7 +431,7 @@ public void createIntentTest2() {
             .build();
     mockIntents.addResponse(expectedResponse);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
     Intent intent = Intent.newBuilder().build();
     String languageCode = "languageCode-412800396";
 
@@ -441,7 +442,7 @@ public void createIntentTest2() {
     Assert.assertEquals(1, actualRequests.size());
     CreateIntentRequest actualRequest = (CreateIntentRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertEquals(intent, actualRequest.getIntent());
     Assert.assertEquals(languageCode, actualRequest.getLanguageCode());
     Assert.assertTrue(
@@ -457,7 +458,7 @@ public void createIntentExceptionTest2() throws Exception {
     mockIntents.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
       Intent intent = Intent.newBuilder().build();
       String languageCode = "languageCode-412800396";
 
@@ -471,7 +472,7 @@ public void createIntentExceptionTest2() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateIntentTest() {
-    IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+    IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
     String displayName = "displayName1615086568";
     int priority = 1165461084;
     boolean isFallback = false;
@@ -499,9 +500,9 @@ public void updateIntentTest() {
     mockIntents.addResponse(expectedResponse);
 
     Intent intent = Intent.newBuilder().build();
-    String languageCode = "languageCode-412800396";
+    FieldMask updateMask = FieldMask.newBuilder().build();
 
-    Intent actualResponse = client.updateIntent(intent, languageCode);
+    Intent actualResponse = client.updateIntent(intent, updateMask);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockIntents.getRequests();
@@ -509,7 +510,7 @@ public void updateIntentTest() {
     UpdateIntentRequest actualRequest = (UpdateIntentRequest) actualRequests.get(0);
 
     Assert.assertEquals(intent, actualRequest.getIntent());
-    Assert.assertEquals(languageCode, actualRequest.getLanguageCode());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -524,9 +525,9 @@ public void updateIntentExceptionTest() throws Exception {
 
     try {
       Intent intent = Intent.newBuilder().build();
-      String languageCode = "languageCode-412800396";
+      FieldMask updateMask = FieldMask.newBuilder().build();
 
-      client.updateIntent(intent, languageCode);
+      client.updateIntent(intent, updateMask);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -536,7 +537,7 @@ public void updateIntentExceptionTest() throws Exception {
   @Test
   @SuppressWarnings("all")
   public void updateIntentTest2() {
-    IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+    IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
     String displayName = "displayName1615086568";
     int priority = 1165461084;
     boolean isFallback = false;
@@ -564,9 +565,9 @@ public void updateIntentTest2() {
     mockIntents.addResponse(expectedResponse);
 
     Intent intent = Intent.newBuilder().build();
-    String languageCode = "languageCode-412800396";
+    FieldMask updateMask = FieldMask.newBuilder().build();
 
-    Intent actualResponse = client.updateIntent(intent, languageCode);
+    Intent actualResponse = client.updateIntent(intent, updateMask);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockIntents.getRequests();
@@ -574,7 +575,7 @@ public void updateIntentTest2() {
     UpdateIntentRequest actualRequest = (UpdateIntentRequest) actualRequests.get(0);
 
     Assert.assertEquals(intent, actualRequest.getIntent());
-    Assert.assertEquals(languageCode, actualRequest.getLanguageCode());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -589,9 +590,139 @@ public void updateIntentExceptionTest2() throws Exception {
 
     try {
       Intent intent = Intent.newBuilder().build();
-      String languageCode = "languageCode-412800396";
+      FieldMask updateMask = FieldMask.newBuilder().build();
+
+      client.updateIntent(intent, updateMask);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateIntentTest3() {
+    IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
+    String displayName = "displayName1615086568";
+    int priority = 1165461084;
+    boolean isFallback = false;
+    boolean mlEnabled = false;
+    boolean mlDisabled = true;
+    boolean endInteraction = true;
+    String action = "action-1422950858";
+    boolean resetContexts = true;
+    String rootFollowupIntentName = "rootFollowupIntentName402253784";
+    String parentFollowupIntentName = "parentFollowupIntentName-1131901680";
+    Intent expectedResponse =
+        Intent.newBuilder()
+            .setName(name.toString())
+            .setDisplayName(displayName)
+            .setPriority(priority)
+            .setIsFallback(isFallback)
+            .setMlEnabled(mlEnabled)
+            .setMlDisabled(mlDisabled)
+            .setEndInteraction(endInteraction)
+            .setAction(action)
+            .setResetContexts(resetContexts)
+            .setRootFollowupIntentName(rootFollowupIntentName)
+            .setParentFollowupIntentName(parentFollowupIntentName)
+            .build();
+    mockIntents.addResponse(expectedResponse);
+
+    Intent intent = Intent.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
+
+    Intent actualResponse = client.updateIntent(intent, updateMask);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockIntents.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateIntentRequest actualRequest = (UpdateIntentRequest) actualRequests.get(0);
+
+    Assert.assertEquals(intent, actualRequest.getIntent());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateIntentExceptionTest3() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockIntents.addException(exception);
+
+    try {
+      Intent intent = Intent.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
+
+      client.updateIntent(intent, updateMask);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateIntentTest4() {
+    IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
+    String displayName = "displayName1615086568";
+    int priority = 1165461084;
+    boolean isFallback = false;
+    boolean mlEnabled = false;
+    boolean mlDisabled = true;
+    boolean endInteraction = true;
+    String action = "action-1422950858";
+    boolean resetContexts = true;
+    String rootFollowupIntentName = "rootFollowupIntentName402253784";
+    String parentFollowupIntentName = "parentFollowupIntentName-1131901680";
+    Intent expectedResponse =
+        Intent.newBuilder()
+            .setName(name.toString())
+            .setDisplayName(displayName)
+            .setPriority(priority)
+            .setIsFallback(isFallback)
+            .setMlEnabled(mlEnabled)
+            .setMlDisabled(mlDisabled)
+            .setEndInteraction(endInteraction)
+            .setAction(action)
+            .setResetContexts(resetContexts)
+            .setRootFollowupIntentName(rootFollowupIntentName)
+            .setParentFollowupIntentName(parentFollowupIntentName)
+            .build();
+    mockIntents.addResponse(expectedResponse);
+
+    Intent intent = Intent.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
+
+    Intent actualResponse = client.updateIntent(intent, updateMask);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockIntents.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateIntentRequest actualRequest = (UpdateIntentRequest) actualRequests.get(0);
+
+    Assert.assertEquals(intent, actualRequest.getIntent());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateIntentExceptionTest4() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockIntents.addException(exception);
+
+    try {
+      Intent intent = Intent.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
 
-      client.updateIntent(intent, languageCode);
+      client.updateIntent(intent, updateMask);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
@@ -604,7 +735,7 @@ public void deleteIntentTest() {
     Empty expectedResponse = Empty.newBuilder().build();
     mockIntents.addResponse(expectedResponse);
 
-    IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+    IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
 
     client.deleteIntent(name);
 
@@ -626,7 +757,7 @@ public void deleteIntentExceptionTest() throws Exception {
     mockIntents.addException(exception);
 
     try {
-      IntentName name = IntentName.of("[PROJECT]", "[INTENT]");
+      IntentName name = IntentName.ofProjectIntentName("[PROJECT]", "[INTENT]");
 
       client.deleteIntent(name);
       Assert.fail("No exception raised");
@@ -647,7 +778,7 @@ public void batchUpdateIntentsTest() throws Exception {
             .build();
     mockIntents.addResponse(resultOperation);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
     BatchUpdateIntentsRequest request =
         BatchUpdateIntentsRequest.newBuilder().setParent(parent.toString()).build();
 
@@ -658,7 +789,7 @@ public void batchUpdateIntentsTest() throws Exception {
     Assert.assertEquals(1, actualRequests.size());
     BatchUpdateIntentsRequest actualRequest = (BatchUpdateIntentsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -672,7 +803,7 @@ public void batchUpdateIntentsExceptionTest() throws Exception {
     mockIntents.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
       BatchUpdateIntentsRequest request =
           BatchUpdateIntentsRequest.newBuilder().setParent(parent.toString()).build();
 
@@ -697,7 +828,7 @@ public void batchDeleteIntentsTest() throws Exception {
             .build();
     mockIntents.addResponse(resultOperation);
 
-    ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+    AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
     List<Intent> intents = new ArrayList<>();
 
     Empty actualResponse = client.batchDeleteIntentsAsync(parent, intents).get();
@@ -707,7 +838,7 @@ public void batchDeleteIntentsTest() throws Exception {
     Assert.assertEquals(1, actualRequests.size());
     BatchDeleteIntentsRequest actualRequest = (BatchDeleteIntentsRequest) actualRequests.get(0);
 
-    Assert.assertEquals(parent, ProjectAgentName.parse(actualRequest.getParent()));
+    Assert.assertEquals(parent, AgentName.parse(actualRequest.getParent()));
     Assert.assertEquals(intents, actualRequest.getIntentsList());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
@@ -722,7 +853,7 @@ public void batchDeleteIntentsExceptionTest() throws Exception {
     mockIntents.addException(exception);
 
     try {
-      ProjectAgentName parent = ProjectAgentName.of("[PROJECT]");
+      AgentName parent = AgentName.ofProjectAgentName("[PROJECT]");
       List<Intent> intents = new ArrayList<>();
 
       client.batchDeleteIntentsAsync(parent, intents).get();
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClientTest.java
index bc1398d55..5cdd68a92 100644
--- a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClientTest.java
+++ b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBasesClientTest.java
@@ -27,6 +27,7 @@
 import com.google.common.collect.Lists;
 import com.google.protobuf.AbstractMessage;
 import com.google.protobuf.Empty;
+import com.google.protobuf.FieldMask;
 import io.grpc.Status;
 import io.grpc.StatusRuntimeException;
 import java.io.IOException;
@@ -42,11 +43,11 @@
 
 @javax.annotation.Generated("by GAPIC")
 public class KnowledgeBasesClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockAgents mockAgents;
   private static MockContexts mockContexts;
   private static MockDocuments mockDocuments;
   private static MockEntityTypes mockEntityTypes;
-  private static MockEnvironments mockEnvironments;
   private static MockIntents mockIntents;
   private static MockKnowledgeBases mockKnowledgeBases;
   private static MockSessionEntityTypes mockSessionEntityTypes;
@@ -57,11 +58,11 @@ public class KnowledgeBasesClientTest {
 
   @BeforeClass
   public static void startStaticServer() {
+    mockEnvironments = new MockEnvironments();
     mockAgents = new MockAgents();
     mockContexts = new MockContexts();
     mockDocuments = new MockDocuments();
     mockEntityTypes = new MockEntityTypes();
-    mockEnvironments = new MockEnvironments();
     mockIntents = new MockIntents();
     mockKnowledgeBases = new MockKnowledgeBases();
     mockSessionEntityTypes = new MockSessionEntityTypes();
@@ -70,11 +71,11 @@ public static void startStaticServer() {
         new MockServiceHelper(
             UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
+                mockEnvironments,
                 mockAgents,
                 mockContexts,
                 mockDocuments,
                 mockEntityTypes,
-                mockEnvironments,
                 mockIntents,
                 mockKnowledgeBases,
                 mockSessionEntityTypes,
@@ -299,8 +300,9 @@ public void updateKnowledgeBaseTest() {
     mockKnowledgeBases.addResponse(expectedResponse);
 
     KnowledgeBase knowledgeBase = KnowledgeBase.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
 
-    KnowledgeBase actualResponse = client.updateKnowledgeBase(knowledgeBase);
+    KnowledgeBase actualResponse = client.updateKnowledgeBase(knowledgeBase, updateMask);
     Assert.assertEquals(expectedResponse, actualResponse);
 
     List<AbstractMessage> actualRequests = mockKnowledgeBases.getRequests();
@@ -308,6 +310,7 @@ public void updateKnowledgeBaseTest() {
     UpdateKnowledgeBaseRequest actualRequest = (UpdateKnowledgeBaseRequest) actualRequests.get(0);
 
     Assert.assertEquals(knowledgeBase, actualRequest.getKnowledgeBase());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -322,8 +325,58 @@ public void updateKnowledgeBaseExceptionTest() throws Exception {
 
     try {
       KnowledgeBase knowledgeBase = KnowledgeBase.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
+
+      client.updateKnowledgeBase(knowledgeBase, updateMask);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateKnowledgeBaseTest2() {
+    KnowledgeBaseName name = KnowledgeBaseName.of("[PROJECT]", "[KNOWLEDGE_BASE]");
+    String displayName = "displayName1615086568";
+    String languageCode = "languageCode-412800396";
+    KnowledgeBase expectedResponse =
+        KnowledgeBase.newBuilder()
+            .setName(name.toString())
+            .setDisplayName(displayName)
+            .setLanguageCode(languageCode)
+            .build();
+    mockKnowledgeBases.addResponse(expectedResponse);
+
+    KnowledgeBase knowledgeBase = KnowledgeBase.newBuilder().build();
+    FieldMask updateMask = FieldMask.newBuilder().build();
+
+    KnowledgeBase actualResponse = client.updateKnowledgeBase(knowledgeBase, updateMask);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockKnowledgeBases.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateKnowledgeBaseRequest actualRequest = (UpdateKnowledgeBaseRequest) actualRequests.get(0);
+
+    Assert.assertEquals(knowledgeBase, actualRequest.getKnowledgeBase());
+    Assert.assertEquals(updateMask, actualRequest.getUpdateMask());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateKnowledgeBaseExceptionTest2() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockKnowledgeBases.addException(exception);
+
+    try {
+      KnowledgeBase knowledgeBase = KnowledgeBase.newBuilder().build();
+      FieldMask updateMask = FieldMask.newBuilder().build();
 
-      client.updateKnowledgeBase(knowledgeBase);
+      client.updateKnowledgeBase(knowledgeBase, updateMask);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
       // Expected exception
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java
index 3fe39c948..d8aa734b5 100644
--- a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java
+++ b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypesClientTest.java
@@ -42,11 +42,11 @@
 
 @javax.annotation.Generated("by GAPIC")
 public class SessionEntityTypesClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockAgents mockAgents;
   private static MockContexts mockContexts;
   private static MockDocuments mockDocuments;
   private static MockEntityTypes mockEntityTypes;
-  private static MockEnvironments mockEnvironments;
   private static MockIntents mockIntents;
   private static MockKnowledgeBases mockKnowledgeBases;
   private static MockSessionEntityTypes mockSessionEntityTypes;
@@ -57,11 +57,11 @@ public class SessionEntityTypesClientTest {
 
   @BeforeClass
   public static void startStaticServer() {
+    mockEnvironments = new MockEnvironments();
     mockAgents = new MockAgents();
     mockContexts = new MockContexts();
     mockDocuments = new MockDocuments();
     mockEntityTypes = new MockEntityTypes();
-    mockEnvironments = new MockEnvironments();
     mockIntents = new MockIntents();
     mockKnowledgeBases = new MockKnowledgeBases();
     mockSessionEntityTypes = new MockSessionEntityTypes();
@@ -70,11 +70,11 @@ public static void startStaticServer() {
         new MockServiceHelper(
             UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
+                mockEnvironments,
                 mockAgents,
                 mockContexts,
                 mockDocuments,
                 mockEntityTypes,
-                mockEnvironments,
                 mockIntents,
                 mockKnowledgeBases,
                 mockSessionEntityTypes,
@@ -117,7 +117,7 @@ public void listSessionEntityTypesTest() {
             .build();
     mockSessionEntityTypes.addResponse(expectedResponse);
 
-    SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+    SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
 
     ListSessionEntityTypesPagedResponse pagedListResponse = client.listSessionEntityTypes(parent);
 
@@ -144,7 +144,7 @@ public void listSessionEntityTypesExceptionTest() throws Exception {
     mockSessionEntityTypes.addException(exception);
 
     try {
-      SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+      SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
 
       client.listSessionEntityTypes(parent);
       Assert.fail("No exception raised");
@@ -157,13 +157,15 @@ public void listSessionEntityTypesExceptionTest() throws Exception {
   @SuppressWarnings("all")
   public void getSessionEntityTypeTest() {
     SessionEntityTypeName name2 =
-        SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+        SessionEntityTypeName.ofProjectSessionEntityTypeName(
+            "[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
     SessionEntityType expectedResponse =
         SessionEntityType.newBuilder().setName(name2.toString()).build();
     mockSessionEntityTypes.addResponse(expectedResponse);
 
     SessionEntityTypeName name =
-        SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+        SessionEntityTypeName.ofProjectSessionEntityTypeName(
+            "[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
 
     SessionEntityType actualResponse = client.getSessionEntityType(name);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -187,7 +189,8 @@ public void getSessionEntityTypeExceptionTest() throws Exception {
 
     try {
       SessionEntityTypeName name =
-          SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+          SessionEntityTypeName.ofProjectSessionEntityTypeName(
+              "[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
 
       client.getSessionEntityType(name);
       Assert.fail("No exception raised");
@@ -200,12 +203,13 @@ public void getSessionEntityTypeExceptionTest() throws Exception {
   @SuppressWarnings("all")
   public void createSessionEntityTypeTest() {
     SessionEntityTypeName name =
-        SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+        SessionEntityTypeName.ofProjectSessionEntityTypeName(
+            "[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
     SessionEntityType expectedResponse =
         SessionEntityType.newBuilder().setName(name.toString()).build();
     mockSessionEntityTypes.addResponse(expectedResponse);
 
-    SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+    SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
     SessionEntityType sessionEntityType = SessionEntityType.newBuilder().build();
 
     SessionEntityType actualResponse = client.createSessionEntityType(parent, sessionEntityType);
@@ -231,7 +235,7 @@ public void createSessionEntityTypeExceptionTest() throws Exception {
     mockSessionEntityTypes.addException(exception);
 
     try {
-      SessionName parent = SessionName.of("[PROJECT]", "[SESSION]");
+      SessionName parent = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
       SessionEntityType sessionEntityType = SessionEntityType.newBuilder().build();
 
       client.createSessionEntityType(parent, sessionEntityType);
@@ -245,7 +249,8 @@ public void createSessionEntityTypeExceptionTest() throws Exception {
   @SuppressWarnings("all")
   public void updateSessionEntityTypeTest() {
     SessionEntityTypeName name =
-        SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+        SessionEntityTypeName.ofProjectSessionEntityTypeName(
+            "[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
     SessionEntityType expectedResponse =
         SessionEntityType.newBuilder().setName(name.toString()).build();
     mockSessionEntityTypes.addResponse(expectedResponse);
@@ -283,6 +288,49 @@ public void updateSessionEntityTypeExceptionTest() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void updateSessionEntityTypeTest2() {
+    SessionEntityTypeName name =
+        SessionEntityTypeName.ofProjectSessionEntityTypeName(
+            "[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+    SessionEntityType expectedResponse =
+        SessionEntityType.newBuilder().setName(name.toString()).build();
+    mockSessionEntityTypes.addResponse(expectedResponse);
+
+    SessionEntityType sessionEntityType = SessionEntityType.newBuilder().build();
+
+    SessionEntityType actualResponse = client.updateSessionEntityType(sessionEntityType);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockSessionEntityTypes.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    UpdateSessionEntityTypeRequest actualRequest =
+        (UpdateSessionEntityTypeRequest) actualRequests.get(0);
+
+    Assert.assertEquals(sessionEntityType, actualRequest.getSessionEntityType());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void updateSessionEntityTypeExceptionTest2() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockSessionEntityTypes.addException(exception);
+
+    try {
+      SessionEntityType sessionEntityType = SessionEntityType.newBuilder().build();
+
+      client.updateSessionEntityType(sessionEntityType);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void deleteSessionEntityTypeTest() {
@@ -290,7 +338,8 @@ public void deleteSessionEntityTypeTest() {
     mockSessionEntityTypes.addResponse(expectedResponse);
 
     SessionEntityTypeName name =
-        SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+        SessionEntityTypeName.ofProjectSessionEntityTypeName(
+            "[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
 
     client.deleteSessionEntityType(name);
 
@@ -314,7 +363,8 @@ public void deleteSessionEntityTypeExceptionTest() throws Exception {
 
     try {
       SessionEntityTypeName name =
-          SessionEntityTypeName.of("[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
+          SessionEntityTypeName.ofProjectSessionEntityTypeName(
+              "[PROJECT]", "[SESSION]", "[ENTITY_TYPE]");
 
       client.deleteSessionEntityType(name);
       Assert.fail("No exception raised");
diff --git a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java
index 3455e9150..8250b5e37 100644
--- a/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java
+++ b/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/SessionsClientTest.java
@@ -44,11 +44,11 @@
 
 @javax.annotation.Generated("by GAPIC")
 public class SessionsClientTest {
+  private static MockEnvironments mockEnvironments;
   private static MockAgents mockAgents;
   private static MockContexts mockContexts;
   private static MockDocuments mockDocuments;
   private static MockEntityTypes mockEntityTypes;
-  private static MockEnvironments mockEnvironments;
   private static MockIntents mockIntents;
   private static MockKnowledgeBases mockKnowledgeBases;
   private static MockSessionEntityTypes mockSessionEntityTypes;
@@ -59,11 +59,11 @@ public class SessionsClientTest {
 
   @BeforeClass
   public static void startStaticServer() {
+    mockEnvironments = new MockEnvironments();
     mockAgents = new MockAgents();
     mockContexts = new MockContexts();
     mockDocuments = new MockDocuments();
     mockEntityTypes = new MockEntityTypes();
-    mockEnvironments = new MockEnvironments();
     mockIntents = new MockIntents();
     mockKnowledgeBases = new MockKnowledgeBases();
     mockSessionEntityTypes = new MockSessionEntityTypes();
@@ -72,11 +72,11 @@ public static void startStaticServer() {
         new MockServiceHelper(
             UUID.randomUUID().toString(),
             Arrays.<MockGrpcService>asList(
+                mockEnvironments,
                 mockAgents,
                 mockContexts,
                 mockDocuments,
                 mockEntityTypes,
-                mockEnvironments,
                 mockIntents,
                 mockKnowledgeBases,
                 mockSessionEntityTypes,
@@ -118,7 +118,7 @@ public void detectIntentTest() {
             .build();
     mockSessions.addResponse(expectedResponse);
 
-    SessionName session = SessionName.of("[PROJECT]", "[SESSION]");
+    SessionName session = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
     QueryInput queryInput = QueryInput.newBuilder().build();
 
     DetectIntentResponse actualResponse = client.detectIntent(session, queryInput);
@@ -143,7 +143,7 @@ public void detectIntentExceptionTest() throws Exception {
     mockSessions.addException(exception);
 
     try {
-      SessionName session = SessionName.of("[PROJECT]", "[SESSION]");
+      SessionName session = SessionName.ofProjectSessionName("[PROJECT]", "[SESSION]");
       QueryInput queryInput = QueryInput.newBuilder().build();
 
       client.detectIntent(session, queryInput);
diff --git a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextsGrpc.java b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextsGrpc.java
index d19a717d8..fe5c53068 100644
--- a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextsGrpc.java
+++ b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/ContextsGrpc.java
@@ -26,22 +26,7 @@
  *
  *
  * <pre>
- * A context represents additional information included with user input or with
- * an intent returned by the Dialogflow API. Contexts are helpful for
- * differentiating user input which may be vague or have a different meaning
- * depending on additional details from your application such as user setting
- * and preferences, previous user input, where the user is in your application,
- * geographic location, and so on.
- * You can include contexts as input parameters of a
- * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
- * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) request,
- * or as output contexts included in the returned intent.
- * Contexts expire when an intent is matched, after the number of `DetectIntent`
- * requests specified by the `lifespan_count` parameter, or after 20 minutes
- * if no intents are matched for a `DetectIntent` request.
- * For more information about contexts, see the
- * [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/contexts-overview).
+ * Service for managing [Contexts][google.cloud.dialogflow.v2.Context].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -362,22 +347,7 @@ public ContextsFutureStub newStub(
    *
    *
    * <pre>
-   * A context represents additional information included with user input or with
-   * an intent returned by the Dialogflow API. Contexts are helpful for
-   * differentiating user input which may be vague or have a different meaning
-   * depending on additional details from your application such as user setting
-   * and preferences, previous user input, where the user is in your application,
-   * geographic location, and so on.
-   * You can include contexts as input parameters of a
-   * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) request,
-   * or as output contexts included in the returned intent.
-   * Contexts expire when an intent is matched, after the number of `DetectIntent`
-   * requests specified by the `lifespan_count` parameter, or after 20 minutes
-   * if no intents are matched for a `DetectIntent` request.
-   * For more information about contexts, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/contexts-overview).
+   * Service for managing [Contexts][google.cloud.dialogflow.v2.Context].
    * </pre>
    */
   public abstract static class ContextsImplBase implements io.grpc.BindableService {
@@ -510,22 +480,7 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * A context represents additional information included with user input or with
-   * an intent returned by the Dialogflow API. Contexts are helpful for
-   * differentiating user input which may be vague or have a different meaning
-   * depending on additional details from your application such as user setting
-   * and preferences, previous user input, where the user is in your application,
-   * geographic location, and so on.
-   * You can include contexts as input parameters of a
-   * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) request,
-   * or as output contexts included in the returned intent.
-   * Contexts expire when an intent is matched, after the number of `DetectIntent`
-   * requests specified by the `lifespan_count` parameter, or after 20 minutes
-   * if no intents are matched for a `DetectIntent` request.
-   * For more information about contexts, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/contexts-overview).
+   * Service for managing [Contexts][google.cloud.dialogflow.v2.Context].
    * </pre>
    */
   public static final class ContextsStub extends io.grpc.stub.AbstractAsyncStub<ContextsStub> {
@@ -639,22 +594,7 @@ public void deleteAllContexts(
    *
    *
    * <pre>
-   * A context represents additional information included with user input or with
-   * an intent returned by the Dialogflow API. Contexts are helpful for
-   * differentiating user input which may be vague or have a different meaning
-   * depending on additional details from your application such as user setting
-   * and preferences, previous user input, where the user is in your application,
-   * geographic location, and so on.
-   * You can include contexts as input parameters of a
-   * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) request,
-   * or as output contexts included in the returned intent.
-   * Contexts expire when an intent is matched, after the number of `DetectIntent`
-   * requests specified by the `lifespan_count` parameter, or after 20 minutes
-   * if no intents are matched for a `DetectIntent` request.
-   * For more information about contexts, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/contexts-overview).
+   * Service for managing [Contexts][google.cloud.dialogflow.v2.Context].
    * </pre>
    */
   public static final class ContextsBlockingStub
@@ -747,22 +687,7 @@ public com.google.protobuf.Empty deleteAllContexts(
    *
    *
    * <pre>
-   * A context represents additional information included with user input or with
-   * an intent returned by the Dialogflow API. Contexts are helpful for
-   * differentiating user input which may be vague or have a different meaning
-   * depending on additional details from your application such as user setting
-   * and preferences, previous user input, where the user is in your application,
-   * geographic location, and so on.
-   * You can include contexts as input parameters of a
-   * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) request,
-   * or as output contexts included in the returned intent.
-   * Contexts expire when an intent is matched, after the number of `DetectIntent`
-   * requests specified by the `lifespan_count` parameter, or after 20 minutes
-   * if no intents are matched for a `DetectIntent` request.
-   * For more information about contexts, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/contexts-overview).
+   * Service for managing [Contexts][google.cloud.dialogflow.v2.Context].
    * </pre>
    */
   public static final class ContextsFutureStub
diff --git a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesGrpc.java b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesGrpc.java
index 8eaa42fcc..9413b7e53 100644
--- a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesGrpc.java
+++ b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityTypesGrpc.java
@@ -26,28 +26,7 @@
  *
  *
  * <pre>
- * Entities are extracted from user input and represent parameters that are
- * meaningful to your application. For example, a date range, a proper name
- * such as a geographic location or landmark, and so on. Entities represent
- * actionable data for your application.
- * When you define an entity, you can also include synonyms that all map to
- * that entity. For example, "soft drink", "soda", "pop", and so on.
- * There are three types of entities:
- * *   **System** - entities that are defined by the Dialogflow API for common
- *     data types such as date, time, currency, and so on. A system entity is
- *     represented by the `EntityType` type.
- * *   **Custom** - entities that are defined by you that represent
- *     actionable data that is meaningful to your application. For example,
- *     you could define a `pizza.sauce` entity for red or white pizza sauce,
- *     a `pizza.cheese` entity for the different types of cheese on a pizza,
- *     a `pizza.topping` entity for different toppings, and so on. A custom
- *     entity is represented by the `EntityType` type.
- * *   **User** - entities that are built for an individual user such as
- *     favorites, preferences, playlists, and so on. A user entity is
- *     represented by the [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] type.
- * For more information about entity types, see the
- * [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+ * Service for managing [EntityTypes][google.cloud.dialogflow.v2.EntityType].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -570,28 +549,7 @@ public EntityTypesFutureStub newStub(
    *
    *
    * <pre>
-   * Entities are extracted from user input and represent parameters that are
-   * meaningful to your application. For example, a date range, a proper name
-   * such as a geographic location or landmark, and so on. Entities represent
-   * actionable data for your application.
-   * When you define an entity, you can also include synonyms that all map to
-   * that entity. For example, "soft drink", "soda", "pop", and so on.
-   * There are three types of entities:
-   * *   **System** - entities that are defined by the Dialogflow API for common
-   *     data types such as date, time, currency, and so on. A system entity is
-   *     represented by the `EntityType` type.
-   * *   **Custom** - entities that are defined by you that represent
-   *     actionable data that is meaningful to your application. For example,
-   *     you could define a `pizza.sauce` entity for red or white pizza sauce,
-   *     a `pizza.cheese` entity for the different types of cheese on a pizza,
-   *     a `pizza.topping` entity for different toppings, and so on. A custom
-   *     entity is represented by the `EntityType` type.
-   * *   **User** - entities that are built for an individual user such as
-   *     favorites, preferences, playlists, and so on. A user entity is
-   *     represented by the [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] type.
-   * For more information about entity types, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+   * Service for managing [EntityTypes][google.cloud.dialogflow.v2.EntityType].
    * </pre>
    */
   public abstract static class EntityTypesImplBase implements io.grpc.BindableService {
@@ -808,28 +766,7 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Entities are extracted from user input and represent parameters that are
-   * meaningful to your application. For example, a date range, a proper name
-   * such as a geographic location or landmark, and so on. Entities represent
-   * actionable data for your application.
-   * When you define an entity, you can also include synonyms that all map to
-   * that entity. For example, "soft drink", "soda", "pop", and so on.
-   * There are three types of entities:
-   * *   **System** - entities that are defined by the Dialogflow API for common
-   *     data types such as date, time, currency, and so on. A system entity is
-   *     represented by the `EntityType` type.
-   * *   **Custom** - entities that are defined by you that represent
-   *     actionable data that is meaningful to your application. For example,
-   *     you could define a `pizza.sauce` entity for red or white pizza sauce,
-   *     a `pizza.cheese` entity for the different types of cheese on a pizza,
-   *     a `pizza.topping` entity for different toppings, and so on. A custom
-   *     entity is represented by the `EntityType` type.
-   * *   **User** - entities that are built for an individual user such as
-   *     favorites, preferences, playlists, and so on. A user entity is
-   *     represented by the [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] type.
-   * For more information about entity types, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+   * Service for managing [EntityTypes][google.cloud.dialogflow.v2.EntityType].
    * </pre>
    */
   public static final class EntityTypesStub
@@ -1016,28 +953,7 @@ public void batchDeleteEntities(
    *
    *
    * <pre>
-   * Entities are extracted from user input and represent parameters that are
-   * meaningful to your application. For example, a date range, a proper name
-   * such as a geographic location or landmark, and so on. Entities represent
-   * actionable data for your application.
-   * When you define an entity, you can also include synonyms that all map to
-   * that entity. For example, "soft drink", "soda", "pop", and so on.
-   * There are three types of entities:
-   * *   **System** - entities that are defined by the Dialogflow API for common
-   *     data types such as date, time, currency, and so on. A system entity is
-   *     represented by the `EntityType` type.
-   * *   **Custom** - entities that are defined by you that represent
-   *     actionable data that is meaningful to your application. For example,
-   *     you could define a `pizza.sauce` entity for red or white pizza sauce,
-   *     a `pizza.cheese` entity for the different types of cheese on a pizza,
-   *     a `pizza.topping` entity for different toppings, and so on. A custom
-   *     entity is represented by the `EntityType` type.
-   * *   **User** - entities that are built for an individual user such as
-   *     favorites, preferences, playlists, and so on. A user entity is
-   *     represented by the [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] type.
-   * For more information about entity types, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+   * Service for managing [EntityTypes][google.cloud.dialogflow.v2.EntityType].
    * </pre>
    */
   public static final class EntityTypesBlockingStub
@@ -1192,28 +1108,7 @@ public com.google.longrunning.Operation batchDeleteEntities(
    *
    *
    * <pre>
-   * Entities are extracted from user input and represent parameters that are
-   * meaningful to your application. For example, a date range, a proper name
-   * such as a geographic location or landmark, and so on. Entities represent
-   * actionable data for your application.
-   * When you define an entity, you can also include synonyms that all map to
-   * that entity. For example, "soft drink", "soda", "pop", and so on.
-   * There are three types of entities:
-   * *   **System** - entities that are defined by the Dialogflow API for common
-   *     data types such as date, time, currency, and so on. A system entity is
-   *     represented by the `EntityType` type.
-   * *   **Custom** - entities that are defined by you that represent
-   *     actionable data that is meaningful to your application. For example,
-   *     you could define a `pizza.sauce` entity for red or white pizza sauce,
-   *     a `pizza.cheese` entity for the different types of cheese on a pizza,
-   *     a `pizza.topping` entity for different toppings, and so on. A custom
-   *     entity is represented by the `EntityType` type.
-   * *   **User** - entities that are built for an individual user such as
-   *     favorites, preferences, playlists, and so on. A user entity is
-   *     represented by the [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] type.
-   * For more information about entity types, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+   * Service for managing [EntityTypes][google.cloud.dialogflow.v2.EntityType].
    * </pre>
    */
   public static final class EntityTypesFutureStub
diff --git a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentsGrpc.java b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentsGrpc.java
index 67fdd7e64..4ae9008e7 100644
--- a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentsGrpc.java
+++ b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EnvironmentsGrpc.java
@@ -26,7 +26,7 @@
  *
  *
  * <pre>
- * Manages agent environments.
+ * Service for managing [Environments][google.cloud.dialogflow.v2.Environment].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -131,7 +131,7 @@ public EnvironmentsFutureStub newStub(
    *
    *
    * <pre>
-   * Manages agent environments.
+   * Service for managing [Environments][google.cloud.dialogflow.v2.Environment].
    * </pre>
    */
   public abstract static class EnvironmentsImplBase implements io.grpc.BindableService {
@@ -168,7 +168,7 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Manages agent environments.
+   * Service for managing [Environments][google.cloud.dialogflow.v2.Environment].
    * </pre>
    */
   public static final class EnvironmentsStub
@@ -204,7 +204,7 @@ public void listEnvironments(
    *
    *
    * <pre>
-   * Manages agent environments.
+   * Service for managing [Environments][google.cloud.dialogflow.v2.Environment].
    * </pre>
    */
   public static final class EnvironmentsBlockingStub
@@ -237,7 +237,7 @@ public com.google.cloud.dialogflow.v2.ListEnvironmentsResponse listEnvironments(
    *
    *
    * <pre>
-   * Manages agent environments.
+   * Service for managing [Environments][google.cloud.dialogflow.v2.Environment].
    * </pre>
    */
   public static final class EnvironmentsFutureStub
diff --git a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentsGrpc.java b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentsGrpc.java
index edf523b21..18cfe7210 100644
--- a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentsGrpc.java
+++ b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/IntentsGrpc.java
@@ -26,33 +26,7 @@
  *
  *
  * <pre>
- * An intent represents a mapping between input from a user and an action to
- * be taken by your application. When you pass user input to the
- * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
- * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method, the
- * Dialogflow API analyzes the input and searches
- * for a matching intent. If no match is found, the Dialogflow API returns a
- * fallback intent (`is_fallback` = true).
- * You can provide additional information for the Dialogflow API to use to
- * match user input to an intent by adding the following to your intent.
- * *   **Contexts** - provide additional context for intent analysis. For
- *     example, if an intent is related to an object in your application that
- *     plays music, you can provide a context to determine when to match the
- *     intent if the user input is "turn it off". You can include a context
- *     that matches the intent when there is previous user input of
- *     "play music", and not when there is previous user input of
- *     "turn on the light".
- * *   **Events** - allow for matching an intent by using an event name
- *     instead of user input. Your application can provide an event name and
- *     related parameters to the Dialogflow API to match an intent. For
- *     example, when your application starts, you can send a welcome event
- *     with a user name parameter to the Dialogflow API to match an intent with
- *     a personalized welcome message for the user.
- * *   **Training phrases** - provide examples of user input to train the
- *     Dialogflow API agent to better match intents.
- * For more information about intents, see the
- * [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/intents-overview).
+ * Service for managing [Intents][google.cloud.dialogflow.v2.Intent].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -416,33 +390,7 @@ public IntentsFutureStub newStub(
    *
    *
    * <pre>
-   * An intent represents a mapping between input from a user and an action to
-   * be taken by your application. When you pass user input to the
-   * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method, the
-   * Dialogflow API analyzes the input and searches
-   * for a matching intent. If no match is found, the Dialogflow API returns a
-   * fallback intent (`is_fallback` = true).
-   * You can provide additional information for the Dialogflow API to use to
-   * match user input to an intent by adding the following to your intent.
-   * *   **Contexts** - provide additional context for intent analysis. For
-   *     example, if an intent is related to an object in your application that
-   *     plays music, you can provide a context to determine when to match the
-   *     intent if the user input is "turn it off". You can include a context
-   *     that matches the intent when there is previous user input of
-   *     "play music", and not when there is previous user input of
-   *     "turn on the light".
-   * *   **Events** - allow for matching an intent by using an event name
-   *     instead of user input. Your application can provide an event name and
-   *     related parameters to the Dialogflow API to match an intent. For
-   *     example, when your application starts, you can send a welcome event
-   *     with a user name parameter to the Dialogflow API to match an intent with
-   *     a personalized welcome message for the user.
-   * *   **Training phrases** - provide examples of user input to train the
-   *     Dialogflow API agent to better match intents.
-   * For more information about intents, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/intents-overview).
+   * Service for managing [Intents][google.cloud.dialogflow.v2.Intent].
    * </pre>
    */
   public abstract static class IntentsImplBase implements io.grpc.BindableService {
@@ -595,33 +543,7 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * An intent represents a mapping between input from a user and an action to
-   * be taken by your application. When you pass user input to the
-   * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method, the
-   * Dialogflow API analyzes the input and searches
-   * for a matching intent. If no match is found, the Dialogflow API returns a
-   * fallback intent (`is_fallback` = true).
-   * You can provide additional information for the Dialogflow API to use to
-   * match user input to an intent by adding the following to your intent.
-   * *   **Contexts** - provide additional context for intent analysis. For
-   *     example, if an intent is related to an object in your application that
-   *     plays music, you can provide a context to determine when to match the
-   *     intent if the user input is "turn it off". You can include a context
-   *     that matches the intent when there is previous user input of
-   *     "play music", and not when there is previous user input of
-   *     "turn on the light".
-   * *   **Events** - allow for matching an intent by using an event name
-   *     instead of user input. Your application can provide an event name and
-   *     related parameters to the Dialogflow API to match an intent. For
-   *     example, when your application starts, you can send a welcome event
-   *     with a user name parameter to the Dialogflow API to match an intent with
-   *     a personalized welcome message for the user.
-   * *   **Training phrases** - provide examples of user input to train the
-   *     Dialogflow API agent to better match intents.
-   * For more information about intents, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/intents-overview).
+   * Service for managing [Intents][google.cloud.dialogflow.v2.Intent].
    * </pre>
    */
   public static final class IntentsStub extends io.grpc.stub.AbstractAsyncStub<IntentsStub> {
@@ -752,33 +674,7 @@ public void batchDeleteIntents(
    *
    *
    * <pre>
-   * An intent represents a mapping between input from a user and an action to
-   * be taken by your application. When you pass user input to the
-   * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method, the
-   * Dialogflow API analyzes the input and searches
-   * for a matching intent. If no match is found, the Dialogflow API returns a
-   * fallback intent (`is_fallback` = true).
-   * You can provide additional information for the Dialogflow API to use to
-   * match user input to an intent by adding the following to your intent.
-   * *   **Contexts** - provide additional context for intent analysis. For
-   *     example, if an intent is related to an object in your application that
-   *     plays music, you can provide a context to determine when to match the
-   *     intent if the user input is "turn it off". You can include a context
-   *     that matches the intent when there is previous user input of
-   *     "play music", and not when there is previous user input of
-   *     "turn on the light".
-   * *   **Events** - allow for matching an intent by using an event name
-   *     instead of user input. Your application can provide an event name and
-   *     related parameters to the Dialogflow API to match an intent. For
-   *     example, when your application starts, you can send a welcome event
-   *     with a user name parameter to the Dialogflow API to match an intent with
-   *     a personalized welcome message for the user.
-   * *   **Training phrases** - provide examples of user input to train the
-   *     Dialogflow API agent to better match intents.
-   * For more information about intents, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/intents-overview).
+   * Service for managing [Intents][google.cloud.dialogflow.v2.Intent].
    * </pre>
    */
   public static final class IntentsBlockingStub
@@ -885,33 +781,7 @@ public com.google.longrunning.Operation batchDeleteIntents(
    *
    *
    * <pre>
-   * An intent represents a mapping between input from a user and an action to
-   * be taken by your application. When you pass user input to the
-   * [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method, the
-   * Dialogflow API analyzes the input and searches
-   * for a matching intent. If no match is found, the Dialogflow API returns a
-   * fallback intent (`is_fallback` = true).
-   * You can provide additional information for the Dialogflow API to use to
-   * match user input to an intent by adding the following to your intent.
-   * *   **Contexts** - provide additional context for intent analysis. For
-   *     example, if an intent is related to an object in your application that
-   *     plays music, you can provide a context to determine when to match the
-   *     intent if the user input is "turn it off". You can include a context
-   *     that matches the intent when there is previous user input of
-   *     "play music", and not when there is previous user input of
-   *     "turn on the light".
-   * *   **Events** - allow for matching an intent by using an event name
-   *     instead of user input. Your application can provide an event name and
-   *     related parameters to the Dialogflow API to match an intent. For
-   *     example, when your application starts, you can send a welcome event
-   *     with a user name parameter to the Dialogflow API to match an intent with
-   *     a personalized welcome message for the user.
-   * *   **Training phrases** - provide examples of user input to train the
-   *     Dialogflow API agent to better match intents.
-   * For more information about intents, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/intents-overview).
+   * Service for managing [Intents][google.cloud.dialogflow.v2.Intent].
    * </pre>
    */
   public static final class IntentsFutureStub
diff --git a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesGrpc.java b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesGrpc.java
index 375c19795..220866b5d 100644
--- a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesGrpc.java
+++ b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityTypesGrpc.java
@@ -26,20 +26,7 @@
  *
  *
  * <pre>
- * Entities are extracted from user input and represent parameters that are
- * meaningful to your application. For example, a date range, a proper name
- * such as a geographic location or landmark, and so on. Entities represent
- * actionable data for your application.
- * Session entity types are referred to as **User** entity types and are
- * entities that are built for an individual user such as
- * favorites, preferences, playlists, and so on. You can redefine a session
- * entity type at the session level.
- * Session entity methods do not work with Google Assistant integration.
- * Contact Dialogflow support if you need to use session entities
- * with Google Assistant integration.
- * For more information about entity types, see the
- * [Dialogflow
- * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+ * Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
  * </pre>
  */
 @javax.annotation.Generated(
@@ -348,20 +335,7 @@ public SessionEntityTypesFutureStub newStub(
    *
    *
    * <pre>
-   * Entities are extracted from user input and represent parameters that are
-   * meaningful to your application. For example, a date range, a proper name
-   * such as a geographic location or landmark, and so on. Entities represent
-   * actionable data for your application.
-   * Session entity types are referred to as **User** entity types and are
-   * entities that are built for an individual user such as
-   * favorites, preferences, playlists, and so on. You can redefine a session
-   * entity type at the session level.
-   * Session entity methods do not work with Google Assistant integration.
-   * Contact Dialogflow support if you need to use session entities
-   * with Google Assistant integration.
-   * For more information about entity types, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
    * </pre>
    */
   public abstract static class SessionEntityTypesImplBase implements io.grpc.BindableService {
@@ -497,20 +471,7 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * Entities are extracted from user input and represent parameters that are
-   * meaningful to your application. For example, a date range, a proper name
-   * such as a geographic location or landmark, and so on. Entities represent
-   * actionable data for your application.
-   * Session entity types are referred to as **User** entity types and are
-   * entities that are built for an individual user such as
-   * favorites, preferences, playlists, and so on. You can redefine a session
-   * entity type at the session level.
-   * Session entity methods do not work with Google Assistant integration.
-   * Contact Dialogflow support if you need to use session entities
-   * with Google Assistant integration.
-   * For more information about entity types, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
    * </pre>
    */
   public static final class SessionEntityTypesStub
@@ -631,20 +592,7 @@ public void deleteSessionEntityType(
    *
    *
    * <pre>
-   * Entities are extracted from user input and represent parameters that are
-   * meaningful to your application. For example, a date range, a proper name
-   * such as a geographic location or landmark, and so on. Entities represent
-   * actionable data for your application.
-   * Session entity types are referred to as **User** entity types and are
-   * entities that are built for an individual user such as
-   * favorites, preferences, playlists, and so on. You can redefine a session
-   * entity type at the session level.
-   * Session entity methods do not work with Google Assistant integration.
-   * Contact Dialogflow support if you need to use session entities
-   * with Google Assistant integration.
-   * For more information about entity types, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
    * </pre>
    */
   public static final class SessionEntityTypesBlockingStub
@@ -747,20 +695,7 @@ public com.google.protobuf.Empty deleteSessionEntityType(
    *
    *
    * <pre>
-   * Entities are extracted from user input and represent parameters that are
-   * meaningful to your application. For example, a date range, a proper name
-   * such as a geographic location or landmark, and so on. Entities represent
-   * actionable data for your application.
-   * Session entity types are referred to as **User** entity types and are
-   * entities that are built for an individual user such as
-   * favorites, preferences, playlists, and so on. You can redefine a session
-   * entity type at the session level.
-   * Session entity methods do not work with Google Assistant integration.
-   * Contact Dialogflow support if you need to use session entities
-   * with Google Assistant integration.
-   * For more information about entity types, see the
-   * [Dialogflow
-   * documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+   * Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
    * </pre>
    */
   public static final class SessionEntityTypesFutureStub
diff --git a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionsGrpc.java b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionsGrpc.java
index 8be235d54..34fe98478 100644
--- a/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionsGrpc.java
+++ b/grpc-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionsGrpc.java
@@ -29,10 +29,9 @@
  *
  *
  * <pre>
- * A session represents an interaction with a user. You retrieve user input
- * and pass it to the [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
- * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method to determine
- * user intent and respond.
+ * A service used for session interactions.
+ * For more information, see the [API interactions
+ * guide](https://cloud.google.com/dialogflow/docs/api-overview).
  * </pre>
  */
 @javax.annotation.Generated(
@@ -184,10 +183,9 @@ public SessionsFutureStub newStub(
    *
    *
    * <pre>
-   * A session represents an interaction with a user. You retrieve user input
-   * and pass it to the [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method to determine
-   * user intent and respond.
+   * A service used for session interactions.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    */
   public abstract static class SessionsImplBase implements io.grpc.BindableService {
@@ -251,10 +249,9 @@ public final io.grpc.ServerServiceDefinition bindService() {
    *
    *
    * <pre>
-   * A session represents an interaction with a user. You retrieve user input
-   * and pass it to the [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method to determine
-   * user intent and respond.
+   * A service used for session interactions.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    */
   public static final class SessionsStub extends io.grpc.stub.AbstractAsyncStub<SessionsStub> {
@@ -311,10 +308,9 @@ public void detectIntent(
    *
    *
    * <pre>
-   * A session represents an interaction with a user. You retrieve user input
-   * and pass it to the [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method to determine
-   * user intent and respond.
+   * A service used for session interactions.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    */
   public static final class SessionsBlockingStub
@@ -348,10 +344,9 @@ public com.google.cloud.dialogflow.v2.DetectIntentResponse detectIntent(
    *
    *
    * <pre>
-   * A session represents an interaction with a user. You retrieve user input
-   * and pass it to the [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-   * [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method to determine
-   * user intent and respond.
+   * A service used for session interactions.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    */
   public static final class SessionsFutureStub
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
index e2ac0942b..a7264d39a 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Agent.java
@@ -29,8 +29,7 @@
  * understand. You design and build a Dialogflow agent to handle the types of
  * conversations required for your system.
  * For more information about agents, see the
- * [Agents
- * documentation](https://cloud.google.com/dialogflow/docs/agents-overview).
+ * [Agent guide](https://cloud.google.com/dialogflow/docs/agents-overview).
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.Agent}
@@ -1567,8 +1566,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    * understand. You design and build a Dialogflow agent to handle the types of
    * conversations required for your system.
    * For more information about agents, see the
-   * [Agents
-   * documentation](https://cloud.google.com/dialogflow/docs/agents-overview).
+   * [Agent guide](https://cloud.google.com/dialogflow/docs/agents-overview).
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.Agent}
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
index f594f8358..659df6dd8 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Context.java
@@ -22,7 +22,19 @@
  *
  *
  * <pre>
- * Represents a context.
+ * Dialogflow contexts are similar to natural language context. If a person says
+ * to you "they are orange", you need context in order to understand what "they"
+ * is referring to. Similarly, for Dialogflow to handle an end-user expression
+ * like that, it needs to be provided with context in order to correctly match
+ * an intent.
+ * Using contexts, you can control the flow of a conversation. You can configure
+ * contexts for an intent by setting input and output contexts, which are
+ * identified by string names. When an intent is matched, any configured output
+ * contexts for that intent become active. While any contexts are active,
+ * Dialogflow is more likely to match intents that are configured with input
+ * contexts that correspond to the currently active contexts.
+ * For more information about context, see the
+ * [Contexts guide](https://cloud.google.com/dialogflow/docs/contexts-overview).
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.Context}
@@ -492,7 +504,19 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Represents a context.
+   * Dialogflow contexts are similar to natural language context. If a person says
+   * to you "they are orange", you need context in order to understand what "they"
+   * is referring to. Similarly, for Dialogflow to handle an end-user expression
+   * like that, it needs to be provided with context in order to correctly match
+   * an intent.
+   * Using contexts, you can control the flow of a conversation. You can configure
+   * contexts for an intent by setting input and output contexts, which are
+   * identified by string names. When an intent is matched, any configured output
+   * contexts for that intent become active. While any contexts are active,
+   * Dialogflow is more likely to match intents that are configured with input
+   * contexts that correspond to the currently active contexts.
+   * For more information about context, see the
+   * [Contexts guide](https://cloud.google.com/dialogflow/docs/contexts-overview).
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.Context}
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
index caf526030..a5c18fc2e 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequest.java
@@ -195,6 +195,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * `User Id`. They can be a random number or some type of user and session
    * identifiers (preferably hashed). The length of the `Session ID` and
    * `User ID` must not exceed 36 characters.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
    * <code>
@@ -228,6 +230,8 @@ public java.lang.String getSession() {
    * `User Id`. They can be a random number or some type of user and session
    * identifiers (preferably hashed). The length of the `Session ID` and
    * `User ID` must not exceed 36 characters.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
    * <code>
@@ -957,6 +961,8 @@ public Builder mergeFrom(
      * `User Id`. They can be a random number or some type of user and session
      * identifiers (preferably hashed). The length of the `Session ID` and
      * `User ID` must not exceed 36 characters.
+     * For more information, see the [API interactions
+     * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
      * <code>
@@ -989,6 +995,8 @@ public java.lang.String getSession() {
      * `User Id`. They can be a random number or some type of user and session
      * identifiers (preferably hashed). The length of the `Session ID` and
      * `User ID` must not exceed 36 characters.
+     * For more information, see the [API interactions
+     * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
      * <code>
@@ -1021,6 +1029,8 @@ public com.google.protobuf.ByteString getSessionBytes() {
      * `User Id`. They can be a random number or some type of user and session
      * identifiers (preferably hashed). The length of the `Session ID` and
      * `User ID` must not exceed 36 characters.
+     * For more information, see the [API interactions
+     * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
      * <code>
@@ -1052,6 +1062,8 @@ public Builder setSession(java.lang.String value) {
      * `User Id`. They can be a random number or some type of user and session
      * identifiers (preferably hashed). The length of the `Session ID` and
      * `User ID` must not exceed 36 characters.
+     * For more information, see the [API interactions
+     * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
      * <code>
@@ -1079,6 +1091,8 @@ public Builder clearSession() {
      * `User Id`. They can be a random number or some type of user and session
      * identifiers (preferably hashed). The length of the `Session ID` and
      * `User ID` must not exceed 36 characters.
+     * For more information, see the [API interactions
+     * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
      * <code>
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java
index df826a768..29a59529c 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/DetectIntentRequestOrBuilder.java
@@ -36,6 +36,8 @@ public interface DetectIntentRequestOrBuilder
    * `User Id`. They can be a random number or some type of user and session
    * identifiers (preferably hashed). The length of the `Session ID` and
    * `User ID` must not exceed 36 characters.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
    * <code>
@@ -58,6 +60,8 @@ public interface DetectIntentRequestOrBuilder
    * `User Id`. They can be a random number or some type of user and session
    * identifiers (preferably hashed). The length of the `Session ID` and
    * `User ID` must not exceed 36 characters.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
    * <code>
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
index cf4b396bd..bc3fb53f4 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/EntityType.java
@@ -22,9 +22,16 @@
  *
  *
  * <pre>
- * Represents an entity type.
- * Entity types serve as a tool for extracting parameter values from natural
- * language queries.
+ * Each intent parameter has a type, called the entity type, which dictates
+ * exactly how data from an end-user expression is extracted.
+ * Dialogflow provides predefined system entities that can match many common
+ * types of data. For example, there are system entities for matching dates,
+ * times, colors, email addresses, and so on. You can also create your own
+ * custom entities for matching custom data. For example, you could define a
+ * vegetable entity that can match the types of vegetables available for
+ * purchase with a grocery store agent.
+ * For more information, see the
+ * [Entity guide](https://cloud.google.com/dialogflow/docs/entities-overview).
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.EntityType}
@@ -2104,9 +2111,16 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Represents an entity type.
-   * Entity types serve as a tool for extracting parameter values from natural
-   * language queries.
+   * Each intent parameter has a type, called the entity type, which dictates
+   * exactly how data from an end-user expression is extracted.
+   * Dialogflow provides predefined system entities that can match many common
+   * types of data. For example, there are system entities for matching dates,
+   * times, colors, email addresses, and so on. You can also create your own
+   * custom entities for matching custom data. For example, you could define a
+   * vegetable entity that can match the types of vegetables available for
+   * purchase with a grocery store agent.
+   * For more information, see the
+   * [Entity guide](https://cloud.google.com/dialogflow/docs/entities-overview).
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.EntityType}
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Environment.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Environment.java
index a89c5179d..abcf40e8a 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Environment.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Environment.java
@@ -22,7 +22,20 @@
  *
  *
  * <pre>
- * Represents an agent environment.
+ * You can create multiple versions of your agent and publish them to separate
+ * environments.
+ * When you edit an agent, you are editing the draft agent. At any point, you
+ * can save the draft agent as an agent version, which is an immutable snapshot
+ * of your agent.
+ * When you save the draft agent, it is published to the default environment.
+ * When you create agent versions, you can publish them to custom environments.
+ * You can create a variety of custom environments for:
+ * - testing
+ * - development
+ * - production
+ * - etc.
+ * For more information, see the [versions and environments
+ * guide](https://cloud.google.com/dialogflow/docs/agents-versions).
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.Environment}
@@ -786,7 +799,20 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Represents an agent environment.
+   * You can create multiple versions of your agent and publish them to separate
+   * environments.
+   * When you edit an agent, you are editing the draft agent. At any point, you
+   * can save the draft agent as an agent version, which is an immutable snapshot
+   * of your agent.
+   * When you save the draft agent, it is published to the default environment.
+   * When you create agent versions, you can publish them to custom environments.
+   * You can create a variety of custom environments for:
+   * - testing
+   * - development
+   * - production
+   * - etc.
+   * For more information, see the [versions and environments
+   * guide](https://cloud.google.com/dialogflow/docs/agents-versions).
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.Environment}
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
index e3e34f193..3ba5cf8de 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/Intent.java
@@ -22,9 +22,14 @@
  *
  *
  * <pre>
- * Represents an intent.
- * Intents convert a number of user expressions or patterns into an action. An
- * action is an extraction of a user command or sentence semantics.
+ * An intent categorizes an end-user's intention for one conversation turn. For
+ * each agent, you define many intents, where your combined intents can handle a
+ * complete conversation. When an end-user writes or says something, referred to
+ * as an end-user expression or end-user input, Dialogflow matches the end-user
+ * input to the best intent in your agent. Matching an intent is also known as
+ * intent classification.
+ * For more information, see the [intent
+ * guide](https://cloud.google.com/dialogflow/docs/intents-overview).
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.Intent}
@@ -48885,9 +48890,14 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Represents an intent.
-   * Intents convert a number of user expressions or patterns into an action. An
-   * action is an extraction of a user command or sentence semantics.
+   * An intent categorizes an end-user's intention for one conversation turn. For
+   * each agent, you define many intents, where your combined intents can handle a
+   * complete conversation. When an end-user writes or says something, referred to
+   * as an end-user expression or end-user input, Dialogflow matches the end-user
+   * input to the best intent in your agent. Matching an intent is also known as
+   * intent classification.
+   * For more information, see the [intent
+   * guide](https://cloud.google.com/dialogflow/docs/intents-overview).
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.Intent}
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisResult.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisResult.java
index 3dc6a042e..39d54258d 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisResult.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SentimentAnalysisResult.java
@@ -22,8 +22,16 @@
  *
  *
  * <pre>
- * The result of sentiment analysis as configured by
- * `sentiment_analysis_request_config`.
+ * The result of sentiment analysis. Sentiment analysis inspects user input
+ * and identifies the prevailing subjective opinion, especially to determine a
+ * user's attitude as positive, negative, or neutral.
+ * For [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent], it needs to be configured in
+ * [DetectIntentRequest.query_params][google.cloud.dialogflow.v2.DetectIntentRequest.query_params]. For
+ * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent], 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
+ * [ConversationProfile.human_agent_assistant_config][google.cloud.dialogflow.v2.ConversationProfile.human_agent_assistant_config]
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SentimentAnalysisResult}
@@ -336,8 +344,16 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * The result of sentiment analysis as configured by
-   * `sentiment_analysis_request_config`.
+   * The result of sentiment analysis. Sentiment analysis inspects user input
+   * and identifies the prevailing subjective opinion, especially to determine a
+   * user's attitude as positive, negative, or neutral.
+   * For [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent], it needs to be configured in
+   * [DetectIntentRequest.query_params][google.cloud.dialogflow.v2.DetectIntentRequest.query_params]. For
+   * [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent], 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
+   * [ConversationProfile.human_agent_assistant_config][google.cloud.dialogflow.v2.ConversationProfile.human_agent_assistant_config]
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SentimentAnalysisResult}
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java
index 47f769f44..4a00178cb 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/SessionEntityType.java
@@ -22,11 +22,13 @@
  *
  *
  * <pre>
- * Represents a session entity type.
- * Extends or replaces a custom entity type at the user session level (we
- * refer to the entity types defined at the agent level as "custom entity
- * types").
- * Note: session entity types apply to all queries, regardless of the language.
+ * A session represents a conversation between a Dialogflow agent and an
+ * end-user. You can create special entities, called session entities, during a
+ * session. Session entities can extend or replace custom entity types and only
+ * exist during the session that they were created for. All session data,
+ * including session entities, is stored by Dialogflow for 20 minutes.
+ * For more information, see the [session entity
+ * guide](https://cloud.google.com/dialogflow/docs/entities-session).
  * </pre>
  *
  * Protobuf type {@code google.cloud.dialogflow.v2.SessionEntityType}
@@ -701,11 +703,13 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * <pre>
-   * Represents a session entity type.
-   * Extends or replaces a custom entity type at the user session level (we
-   * refer to the entity types defined at the agent level as "custom entity
-   * types").
-   * Note: session entity types apply to all queries, regardless of the language.
+   * A session represents a conversation between a Dialogflow agent and an
+   * end-user. You can create special entities, called session entities, during a
+   * session. Session entities can extend or replace custom entity types and only
+   * exist during the session that they were created for. All session data,
+   * including session entities, is stored by Dialogflow for 20 minutes.
+   * For more information, see the [session entity
+   * guide](https://cloud.google.com/dialogflow/docs/entities-session).
    * </pre>
    *
    * Protobuf type {@code google.cloud.dialogflow.v2.SessionEntityType}
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java
index b5f9bba2b..545396a2d 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequest.java
@@ -225,6 +225,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * `User Id`. They can be a random number or some type of user and session
    * identifiers (preferably hashed). The length of the `Session ID` and
    * `User ID` must not exceed 36 characters.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
    * <code>
@@ -259,6 +261,8 @@ public java.lang.String getSession() {
    * `User Id`. They can be a random number or some type of user and session
    * identifiers (preferably hashed). The length of the `Session ID` and
    * `User ID` must not exceed 36 characters.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
    * <code>
@@ -1055,6 +1059,8 @@ public Builder mergeFrom(
      * `User Id`. They can be a random number or some type of user and session
      * identifiers (preferably hashed). The length of the `Session ID` and
      * `User ID` must not exceed 36 characters.
+     * For more information, see the [API interactions
+     * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
      * <code>
@@ -1088,6 +1094,8 @@ public java.lang.String getSession() {
      * `User Id`. They can be a random number or some type of user and session
      * identifiers (preferably hashed). The length of the `Session ID` and
      * `User ID` must not exceed 36 characters.
+     * For more information, see the [API interactions
+     * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
      * <code>
@@ -1121,6 +1129,8 @@ public com.google.protobuf.ByteString getSessionBytes() {
      * `User Id`. They can be a random number or some type of user and session
      * identifiers (preferably hashed). The length of the `Session ID` and
      * `User ID` must not exceed 36 characters.
+     * For more information, see the [API interactions
+     * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
      * <code>
@@ -1153,6 +1163,8 @@ public Builder setSession(java.lang.String value) {
      * `User Id`. They can be a random number or some type of user and session
      * identifiers (preferably hashed). The length of the `Session ID` and
      * `User ID` must not exceed 36 characters.
+     * For more information, see the [API interactions
+     * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
      * <code>
@@ -1181,6 +1193,8 @@ public Builder clearSession() {
      * `User Id`. They can be a random number or some type of user and session
      * identifiers (preferably hashed). The length of the `Session ID` and
      * `User ID` must not exceed 36 characters.
+     * For more information, see the [API interactions
+     * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
      * <code>
diff --git a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequestOrBuilder.java
index 592ff462a..e2cd75ac1 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2/src/main/java/com/google/cloud/dialogflow/v2/StreamingDetectIntentRequestOrBuilder.java
@@ -37,6 +37,8 @@ public interface StreamingDetectIntentRequestOrBuilder
    * `User Id`. They can be a random number or some type of user and session
    * identifiers (preferably hashed). The length of the `Session ID` and
    * `User ID` must not exceed 36 characters.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
    * <code>
@@ -60,6 +62,8 @@ public interface StreamingDetectIntentRequestOrBuilder
    * `User Id`. They can be a random number or some type of user and session
    * identifiers (preferably hashed). The length of the `Session ID` and
    * `User ID` must not exceed 36 characters.
+   * For more information, see the [API interactions
+   * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
    * <code>
diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto
index 7eb7c5259..1ce271736 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto
+++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/agent.proto
@@ -173,8 +173,7 @@ service Agents {
 // conversations required for your system.
 //
 // For more information about agents, see the
-// [Agents
-// documentation](https://cloud.google.com/dialogflow/docs/agents-overview).
+// [Agent guide](https://cloud.google.com/dialogflow/docs/agents-overview).
 message Agent {
   option (google.api.resource) = {
     type: "dialogflow.googleapis.com/Agent"
diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto
index 3d17394d3..19b1e09b9 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto
+++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/audio_config.proto
@@ -85,6 +85,7 @@ message SpeechContext {
   // recognizer should recognize with higher likelihood.
   //
   // This list can be used to:
+  //
   // * improve accuracy for words and phrases you expect the user to say,
   //   e.g. typical commands for your Dialogflow agent
   // * add additional words to the speech recognizer vocabulary
diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto
index e647c4ff9..07740d1f7 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto
+++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/context.proto
@@ -32,24 +32,7 @@ option java_outer_classname = "ContextProto";
 option java_package = "com.google.cloud.dialogflow.v2";
 option objc_class_prefix = "DF";
 
-// A context represents additional information included with user input or with
-// an intent returned by the Dialogflow API. Contexts are helpful for
-// differentiating user input which may be vague or have a different meaning
-// depending on additional details from your application such as user setting
-// and preferences, previous user input, where the user is in your application,
-// geographic location, and so on.
-//
-// You can include contexts as input parameters of a
-// [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-// [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) request,
-// or as output contexts included in the returned intent.
-// Contexts expire when an intent is matched, after the number of `DetectIntent`
-// requests specified by the `lifespan_count` parameter, or after 20 minutes
-// if no intents are matched for a `DetectIntent` request.
-//
-// For more information about contexts, see the
-// [Dialogflow
-// documentation](https://cloud.google.com/dialogflow/docs/contexts-overview).
+// Service for managing [Contexts][google.cloud.dialogflow.v2.Context].
 service Contexts {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -129,7 +112,21 @@ service Contexts {
   }
 }
 
-// Represents a context.
+// Dialogflow contexts are similar to natural language context. If a person says
+// to you "they are orange", you need context in order to understand what "they"
+// is referring to. Similarly, for Dialogflow to handle an end-user expression
+// like that, it needs to be provided with context in order to correctly match
+// an intent.
+//
+// Using contexts, you can control the flow of a conversation. You can configure
+// contexts for an intent by setting input and output contexts, which are
+// identified by string names. When an intent is matched, any configured output
+// contexts for that intent become active. While any contexts are active,
+// Dialogflow is more likely to match intents that are configured with input
+// contexts that correspond to the currently active contexts.
+//
+// For more information about context, see the
+// [Contexts guide](https://cloud.google.com/dialogflow/docs/contexts-overview).
 message Context {
   option (google.api.resource) = {
     type: "dialogflow.googleapis.com/Context"
diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto
index 5c0273724..13fcdb050 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto
+++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/entity_type.proto
@@ -32,34 +32,7 @@ option java_outer_classname = "EntityTypeProto";
 option java_package = "com.google.cloud.dialogflow.v2";
 option objc_class_prefix = "DF";
 
-// Entities are extracted from user input and represent parameters that are
-// meaningful to your application. For example, a date range, a proper name
-// such as a geographic location or landmark, and so on. Entities represent
-// actionable data for your application.
-//
-// When you define an entity, you can also include synonyms that all map to
-// that entity. For example, "soft drink", "soda", "pop", and so on.
-//
-// There are three types of entities:
-//
-// *   **System** - entities that are defined by the Dialogflow API for common
-//     data types such as date, time, currency, and so on. A system entity is
-//     represented by the `EntityType` type.
-//
-// *   **Custom** - entities that are defined by you that represent
-//     actionable data that is meaningful to your application. For example,
-//     you could define a `pizza.sauce` entity for red or white pizza sauce,
-//     a `pizza.cheese` entity for the different types of cheese on a pizza,
-//     a `pizza.topping` entity for different toppings, and so on. A custom
-//     entity is represented by the `EntityType` type.
-//
-// *   **User** - entities that are built for an individual user such as
-//     favorites, preferences, playlists, and so on. A user entity is
-//     represented by the [SessionEntityType][google.cloud.dialogflow.v2.SessionEntityType] type.
-//
-// For more information about entity types, see the
-// [Dialogflow
-// documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+// Service for managing [EntityTypes][google.cloud.dialogflow.v2.EntityType].
 service EntityTypes {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -194,9 +167,18 @@ service EntityTypes {
   }
 }
 
-// Represents an entity type.
-// Entity types serve as a tool for extracting parameter values from natural
-// language queries.
+// Each intent parameter has a type, called the entity type, which dictates
+// exactly how data from an end-user expression is extracted.
+//
+// Dialogflow provides predefined system entities that can match many common
+// types of data. For example, there are system entities for matching dates,
+// times, colors, email addresses, and so on. You can also create your own
+// custom entities for matching custom data. For example, you could define a
+// vegetable entity that can match the types of vegetables available for
+// purchase with a grocery store agent.
+//
+// For more information, see the
+// [Entity guide](https://cloud.google.com/dialogflow/docs/entities-overview).
 message EntityType {
   option (google.api.resource) = {
     type: "dialogflow.googleapis.com/EntityType"
diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto
index 5bb7413f6..d48c210fc 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto
+++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/environment.proto
@@ -32,7 +32,7 @@ option java_outer_classname = "EnvironmentProto";
 option java_package = "com.google.cloud.dialogflow.v2";
 option objc_class_prefix = "DF";
 
-// Manages agent environments.
+// Service for managing [Environments][google.cloud.dialogflow.v2.Environment].
 service Environments {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -47,7 +47,24 @@ service Environments {
   }
 }
 
-// Represents an agent environment.
+// You can create multiple versions of your agent and publish them to separate
+// environments.
+//
+// When you edit an agent, you are editing the draft agent. At any point, you
+// can save the draft agent as an agent version, which is an immutable snapshot
+// of your agent.
+//
+// When you save the draft agent, it is published to the default environment.
+// When you create agent versions, you can publish them to custom environments.
+// You can create a variety of custom environments for:
+//
+// - testing
+// - development
+// - production
+// - etc.
+//
+// For more information, see the [versions and environments
+// guide](https://cloud.google.com/dialogflow/docs/agents-versions).
 message Environment {
   option (google.api.resource) = {
     type: "dialogflow.googleapis.com/Environment"
diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto
index 6a176c35c..f4f78acad 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto
+++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/intent.proto
@@ -36,38 +36,7 @@ option java_outer_classname = "IntentProto";
 option java_package = "com.google.cloud.dialogflow.v2";
 option objc_class_prefix = "DF";
 
-// An intent represents a mapping between input from a user and an action to
-// be taken by your application. When you pass user input to the
-// [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-// [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method, the
-// Dialogflow API analyzes the input and searches
-// for a matching intent. If no match is found, the Dialogflow API returns a
-// fallback intent (`is_fallback` = true).
-//
-// You can provide additional information for the Dialogflow API to use to
-// match user input to an intent by adding the following to your intent.
-//
-// *   **Contexts** - provide additional context for intent analysis. For
-//     example, if an intent is related to an object in your application that
-//     plays music, you can provide a context to determine when to match the
-//     intent if the user input is "turn it off". You can include a context
-//     that matches the intent when there is previous user input of
-//     "play music", and not when there is previous user input of
-//     "turn on the light".
-//
-// *   **Events** - allow for matching an intent by using an event name
-//     instead of user input. Your application can provide an event name and
-//     related parameters to the Dialogflow API to match an intent. For
-//     example, when your application starts, you can send a welcome event
-//     with a user name parameter to the Dialogflow API to match an intent with
-//     a personalized welcome message for the user.
-//
-// *   **Training phrases** - provide examples of user input to train the
-//     Dialogflow API agent to better match intents.
-//
-// For more information about intents, see the
-// [Dialogflow
-// documentation](https://cloud.google.com/dialogflow/docs/intents-overview).
+// Service for managing [Intents][google.cloud.dialogflow.v2.Intent].
 service Intents {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -152,9 +121,15 @@ service Intents {
   }
 }
 
-// Represents an intent.
-// Intents convert a number of user expressions or patterns into an action. An
-// action is an extraction of a user command or sentence semantics.
+// An intent categorizes an end-user's intention for one conversation turn. For
+// each agent, you define many intents, where your combined intents can handle a
+// complete conversation. When an end-user writes or says something, referred to
+// as an end-user expression or end-user input, Dialogflow matches the end-user
+// input to the best intent in your agent. Matching an intent is also known as
+// intent classification.
+//
+// For more information, see the [intent
+// guide](https://cloud.google.com/dialogflow/docs/intents-overview).
 message Intent {
   option (google.api.resource) = {
     type: "dialogflow.googleapis.com/Intent"
diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto
index 9e3d9442d..96e7c2ced 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto
+++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session.proto
@@ -43,10 +43,10 @@ option (google.api.resource_definition) = {
   pattern: "projects/{project}/agent/environments/{environment}/users/{user}/sessions/{session}"
 };
 
-// A session represents an interaction with a user. You retrieve user input
-// and pass it to the [DetectIntent][google.cloud.dialogflow.v2.Sessions.DetectIntent] (or
-// [StreamingDetectIntent][google.cloud.dialogflow.v2.Sessions.StreamingDetectIntent]) method to determine
-// user intent and respond.
+// A service used for session interactions.
+//
+// For more information, see the [API interactions
+// guide](https://cloud.google.com/dialogflow/docs/api-overview).
 service Sessions {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -87,6 +87,9 @@ message DetectIntentRequest {
   // `User Id`. They can be a random number or some type of user and session
   // identifiers (preferably hashed). The length of the `Session ID` and
   // `User ID` must not exceed 36 characters.
+  //
+  // For more information, see the [API interactions
+  // guide](https://cloud.google.com/dialogflow/docs/api-overview).
   string session = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = {
@@ -362,6 +365,9 @@ message StreamingDetectIntentRequest {
   // `User Id`. They can be a random number or some type of user and session
   // identifiers (preferably hashed). The length of the `Session ID` and
   // `User ID` must not exceed 36 characters.
+  //
+  // For more information, see the [API interactions
+  // guide](https://cloud.google.com/dialogflow/docs/api-overview).
   string session = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = {
@@ -591,8 +597,16 @@ message SentimentAnalysisRequestConfig {
   bool analyze_query_text_sentiment = 1;
 }
 
-// The result of sentiment analysis as configured by
-// `sentiment_analysis_request_config`.
+// The result of sentiment analysis. Sentiment analysis inspects user input
+// and identifies the prevailing subjective opinion, especially to determine a
+// user's attitude as positive, negative, or neutral.
+// For [Participants.AnalyzeContent][google.cloud.dialogflow.v2.Participants.AnalyzeContent], it needs to be configured in
+// [DetectIntentRequest.query_params][google.cloud.dialogflow.v2.DetectIntentRequest.query_params]. For
+// [Participants.StreamingAnalyzeContent][google.cloud.dialogflow.v2.Participants.StreamingAnalyzeContent], 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
+// [ConversationProfile.human_agent_assistant_config][google.cloud.dialogflow.v2.ConversationProfile.human_agent_assistant_config]
 message SentimentAnalysisResult {
   // The sentiment analysis result for `query_text`.
   Sentiment query_text_sentiment = 1;
diff --git a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto
index 9a16a5583..8d7fa89c0 100644
--- a/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto
+++ b/proto-google-cloud-dialogflow-v2/src/main/proto/google/cloud/dialogflow/v2/session_entity_type.proto
@@ -32,23 +32,7 @@ option java_outer_classname = "SessionEntityTypeProto";
 option java_package = "com.google.cloud.dialogflow.v2";
 option objc_class_prefix = "DF";
 
-// Entities are extracted from user input and represent parameters that are
-// meaningful to your application. For example, a date range, a proper name
-// such as a geographic location or landmark, and so on. Entities represent
-// actionable data for your application.
-//
-// Session entity types are referred to as **User** entity types and are
-// entities that are built for an individual user such as
-// favorites, preferences, playlists, and so on. You can redefine a session
-// entity type at the session level.
-//
-// Session entity methods do not work with Google Assistant integration.
-// Contact Dialogflow support if you need to use session entities
-// with Google Assistant integration.
-//
-// For more information about entity types, see the
-// [Dialogflow
-// documentation](https://cloud.google.com/dialogflow/docs/entities-overview).
+// Service for managing [SessionEntityTypes][google.cloud.dialogflow.v2.SessionEntityType].
 service SessionEntityTypes {
   option (google.api.default_host) = "dialogflow.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -139,13 +123,14 @@ service SessionEntityTypes {
   }
 }
 
-// Represents a session entity type.
-//
-// Extends or replaces a custom entity type at the user session level (we
-// refer to the entity types defined at the agent level as "custom entity
-// types").
+// A session represents a conversation between a Dialogflow agent and an
+// end-user. You can create special entities, called session entities, during a
+// session. Session entities can extend or replace custom entity types and only
+// exist during the session that they were created for. All session data,
+// including session entities, is stored by Dialogflow for 20 minutes.
 //
-// Note: session entity types apply to all queries, regardless of the language.
+// For more information, see the [session entity
+// guide](https://cloud.google.com/dialogflow/docs/entities-session).
 message SessionEntityType {
   option (google.api.resource) = {
     type: "dialogflow.googleapis.com/SessionEntityType"
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentName.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentName.java
new file mode 100644
index 000000000..59c58c800
--- /dev/null
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentName.java
@@ -0,0 +1,270 @@
+/*
+ * 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.
+ */
+
+package com.google.cloud.dialogflow.v2beta1;
+
+import com.google.api.core.BetaApi;
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.pathtemplate.ValidationException;
+import com.google.api.resourcenames.ResourceName;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/** AUTO-GENERATED DOCUMENTATION AND CLASS */
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class AgentName implements ResourceName {
+
+  @Deprecated
+  protected AgentName() {}
+
+  private static final PathTemplate PROJECT_AGENT_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/agent");
+  private static final PathTemplate PROJECT_LOCATION_AGENT_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/locations/{location}/agent");
+
+  private volatile Map<String, String> fieldValuesMap;
+  private PathTemplate pathTemplate;
+  private String fixedValue;
+
+  private String project;
+  private String location;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  private AgentName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    pathTemplate = PROJECT_AGENT_PATH_TEMPLATE;
+  }
+
+  private AgentName(ProjectLocationAgentBuilder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    pathTemplate = PROJECT_LOCATION_AGENT_PATH_TEMPLATE;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static Builder newProjectAgentBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static ProjectLocationAgentBuilder newProjectLocationAgentBuilder() {
+    return new ProjectLocationAgentBuilder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  public static AgentName of(String project) {
+    return newProjectAgentBuilder().setProject(project).build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static AgentName ofProjectAgentName(String project) {
+    return newProjectAgentBuilder().setProject(project).build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static AgentName ofProjectLocationAgentName(String project, String location) {
+    return newProjectLocationAgentBuilder().setProject(project).setLocation(location).build();
+  }
+
+  public static String format(String project) {
+    return newBuilder().setProject(project).build().toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectAgentName(String project) {
+    return newBuilder().setProject(project).build().toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectLocationAgentName(String project, String location) {
+    return newProjectLocationAgentBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .build()
+        .toString();
+  }
+
+  public static AgentName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    if (PROJECT_AGENT_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap = PROJECT_AGENT_PATH_TEMPLATE.match(formattedString);
+      return ofProjectAgentName(matchMap.get("project"));
+    } else if (PROJECT_LOCATION_AGENT_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap = PROJECT_LOCATION_AGENT_PATH_TEMPLATE.match(formattedString);
+      return ofProjectLocationAgentName(matchMap.get("project"), matchMap.get("location"));
+    }
+    throw new ValidationException("JobName.parse: formattedString not in valid format");
+  }
+
+  public static List<AgentName> parseList(List<String> formattedStrings) {
+    List<AgentName> list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List<String> toStringList(List<AgentName> values) {
+    List<String> list = new ArrayList<>(values.size());
+    for (AgentName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PROJECT_AGENT_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_LOCATION_AGENT_PATH_TEMPLATE.matches(formattedString);
+  }
+
+  @Override
+  public Map<String, String> getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
+          if (project != null) {
+            fieldMapBuilder.put("project", project);
+          }
+          if (location != null) {
+            fieldMapBuilder.put("location", location);
+          }
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  @Override
+  public String toString() {
+    return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
+  }
+
+  /** Builder for projects/{project}/agent. */
+  public static class Builder {
+
+    private String project;
+
+    protected Builder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    private Builder(AgentName agentName) {
+      Preconditions.checkArgument(
+          agentName.pathTemplate == PROJECT_AGENT_PATH_TEMPLATE,
+          "toBuilder is only supported when AgentName has the pattern of "
+              + "projects/{project}/agent.");
+      project = agentName.project;
+    }
+
+    public AgentName build() {
+      return new AgentName(this);
+    }
+  }
+
+  /** Builder for projects/{project}/locations/{location}/agent. */
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static class ProjectLocationAgentBuilder {
+
+    private String project;
+    private String location;
+
+    private ProjectLocationAgentBuilder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public ProjectLocationAgentBuilder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public ProjectLocationAgentBuilder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public AgentName build() {
+      return new AgentName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o != null || getClass() == o.getClass()) {
+      AgentName that = (AgentName) o;
+      return (Objects.equals(this.project, that.project))
+          && (Objects.equals(this.location, that.location));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= Objects.hashCode(fixedValue);
+    h *= 1000003;
+    h ^= Objects.hashCode(project);
+    h *= 1000003;
+    h ^= Objects.hashCode(location);
+    return h;
+  }
+}
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentProto.java
index 0a110bd1f..de850a8f7 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentProto.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentProto.java
@@ -120,97 +120,98 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "Agent\022\030projects/{project}/agent\022-project"
           + "s/{project}/locations/{location}/agent\"J"
           + "\n\017GetAgentRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A"
-          + "!\022\037dialogflow.googleapis.com/Agent\"y\n\017Se"
-          + "tAgentRequest\0225\n\005agent\030\001 \001(\0132&.google.cl"
-          + "oud.dialogflow.v2beta1.Agent\022/\n\013update_m"
-          + "ask\030\002 \001(\0132\032.google.protobuf.FieldMask\"M\n"
-          + "\022DeleteAgentRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002"
-          + "\372A!\022\037dialogflow.googleapis.com/Agent\"0\n\010"
-          + "SubAgent\022\017\n\007project\030\001 \001(\t\022\023\n\013environment"
-          + "\030\002 \001(\t\"u\n\023SearchAgentsRequest\0227\n\006parent\030"
-          + "\001 \001(\tB\'\340A\002\372A!\022\037dialogflow.googleapis.com"
-          + "/Agent\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030"
-          + "\003 \001(\t\"g\n\024SearchAgentsResponse\0226\n\006agents\030"
-          + "\001 \003(\0132&.google.cloud.dialogflow.v2beta1."
-          + "Agent\022\027\n\017next_page_token\030\002 \001(\t\"L\n\021TrainA"
-          + "gentRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\022\037dia"
-          + "logflow.googleapis.com/Agent\"7\n\022ExportAg"
-          + "entRequest\022\016\n\006parent\030\001 \001(\t\022\021\n\tagent_uri\030"
-          + "\002 \001(\t\"L\n\023ExportAgentResponse\022\023\n\tagent_ur"
-          + "i\030\001 \001(\tH\000\022\027\n\ragent_content\030\002 \001(\014H\000B\007\n\005ag"
-          + "ent\"\204\001\n\022ImportAgentRequest\0227\n\006parent\030\001 \001"
-          + "(\tB\'\340A\002\372A!\022\037dialogflow.googleapis.com/Ag"
-          + "ent\022\023\n\tagent_uri\030\002 \001(\tH\000\022\027\n\ragent_conten"
-          + "t\030\003 \001(\014H\000B\007\n\005agent\"\205\001\n\023RestoreAgentReque"
-          + "st\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\022\037dialogflow.g"
-          + "oogleapis.com/Agent\022\023\n\tagent_uri\030\002 \001(\tH\000"
-          + "\022\027\n\ragent_content\030\003 \001(\014H\000B\007\n\005agent\"q\n\032Ge"
-          + "tValidationResultRequest\0227\n\006parent\030\001 \001(\t"
+          + "!\022\037dialogflow.googleapis.com/Agent\"~\n\017Se"
+          + "tAgentRequest\022:\n\005agent\030\001 \001(\0132&.google.cl"
+          + "oud.dialogflow.v2beta1.AgentB\003\340A\002\022/\n\013upd"
+          + "ate_mask\030\002 \001(\0132\032.google.protobuf.FieldMa"
+          + "sk\"M\n\022DeleteAgentRequest\0227\n\006parent\030\001 \001(\t"
           + "B\'\340A\002\372A!\022\037dialogflow.googleapis.com/Agen"
-          + "t\022\032\n\rlanguage_code\030\003 \001(\tB\003\340A\0012\207\022\n\006Agents"
-          + "\022\313\001\n\010GetAgent\0220.google.cloud.dialogflow."
-          + "v2beta1.GetAgentRequest\032&.google.cloud.d"
-          + "ialogflow.v2beta1.Agent\"e\202\323\344\223\002V\022\"/v2beta"
-          + "1/{parent=projects/*}/agentZ0\022./v2beta1/"
-          + "{parent=projects/*/locations/*}/agent\332A\006"
-          + "parent\022\344\001\n\010SetAgent\0220.google.cloud.dialo"
-          + "gflow.v2beta1.SetAgentRequest\032&.google.c"
-          + "loud.dialogflow.v2beta1.Agent\"~\202\323\344\223\002p\"(/"
-          + "v2beta1/{agent.parent=projects/*}/agent:"
-          + "\005agentZ=\"4/v2beta1/{agent.parent=project"
-          + "s/*/locations/*}/agent:\005agent\332A\005agent\022\301\001"
-          + "\n\013DeleteAgent\0223.google.cloud.dialogflow."
-          + "v2beta1.DeleteAgentRequest\032\026.google.prot"
-          + "obuf.Empty\"e\202\323\344\223\002V*\"/v2beta1/{parent=pro"
-          + "jects/*}/agentZ0*./v2beta1/{parent=proje"
-          + "cts/*/locations/*}/agent\332A\006parent\022\360\001\n\014Se"
-          + "archAgents\0224.google.cloud.dialogflow.v2b"
-          + "eta1.SearchAgentsRequest\0325.google.cloud."
-          + "dialogflow.v2beta1.SearchAgentsResponse\""
-          + "s\202\323\344\223\002d\022)/v2beta1/{parent=projects/*}/ag"
-          + "ent:searchZ7\0225/v2beta1/{parent=projects/"
-          + "*/locations/*}/agent:search\332A\006parent\022\213\002\n"
-          + "\nTrainAgent\0222.google.cloud.dialogflow.v2"
-          + "beta1.TrainAgentRequest\032\035.google.longrun"
-          + "ning.Operation\"\251\001\202\323\344\223\002h\"(/v2beta1/{paren"
-          + "t=projects/*}/agent:train:\001*Z9\"4/v2beta1"
-          + "/{parent=projects/*/locations/*}/agent:t"
-          + "rain:\001*\332A\006parent\312A/\n\025google.protobuf.Emp"
-          + "ty\022\026google.protobuf.Struct\022\255\002\n\013ExportAge"
-          + "nt\0223.google.cloud.dialogflow.v2beta1.Exp"
-          + "ortAgentRequest\032\035.google.longrunning.Ope"
-          + "ration\"\311\001\202\323\344\223\002j\")/v2beta1/{parent=projec"
-          + "ts/*}/agent:export:\001*Z:\"5/v2beta1/{paren"
-          + "t=projects/*/locations/*}/agent:export:\001"
-          + "*\332A\006parent\312AM\n3google.cloud.dialogflow.v"
-          + "2beta1.ExportAgentResponse\022\026google.proto"
-          + "buf.Struct\022\206\002\n\013ImportAgent\0223.google.clou"
-          + "d.dialogflow.v2beta1.ImportAgentRequest\032"
-          + "\035.google.longrunning.Operation\"\242\001\202\323\344\223\002j\""
-          + ")/v2beta1/{parent=projects/*}/agent:impo"
-          + "rt:\001*Z:\"5/v2beta1/{parent=projects/*/loc"
-          + "ations/*}/agent:import:\001*\312A/\n\025google.pro"
-          + "tobuf.Empty\022\026google.protobuf.Struct\022\212\002\n\014"
-          + "RestoreAgent\0224.google.cloud.dialogflow.v"
-          + "2beta1.RestoreAgentRequest\032\035.google.long"
-          + "running.Operation\"\244\001\202\323\344\223\002l\"*/v2beta1/{pa"
-          + "rent=projects/*}/agent:restore:\001*Z;\"6/v2"
+          + "t\"0\n\010SubAgent\022\017\n\007project\030\001 \001(\t\022\023\n\013enviro"
+          + "nment\030\002 \001(\t\"u\n\023SearchAgentsRequest\0227\n\006pa"
+          + "rent\030\001 \001(\tB\'\340A\002\372A!\022\037dialogflow.googleapi"
+          + "s.com/Agent\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_t"
+          + "oken\030\003 \001(\t\"g\n\024SearchAgentsResponse\0226\n\006ag"
+          + "ents\030\001 \003(\0132&.google.cloud.dialogflow.v2b"
+          + "eta1.Agent\022\027\n\017next_page_token\030\002 \001(\t\"L\n\021T"
+          + "rainAgentRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!"
+          + "\022\037dialogflow.googleapis.com/Agent\"`\n\022Exp"
+          + "ortAgentRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\022"
+          + "\037dialogflow.googleapis.com/Agent\022\021\n\tagen"
+          + "t_uri\030\002 \001(\t\"L\n\023ExportAgentResponse\022\023\n\tag"
+          + "ent_uri\030\001 \001(\tH\000\022\027\n\ragent_content\030\002 \001(\014H\000"
+          + "B\007\n\005agent\"\204\001\n\022ImportAgentRequest\0227\n\006pare"
+          + "nt\030\001 \001(\tB\'\340A\002\372A!\022\037dialogflow.googleapis."
+          + "com/Agent\022\023\n\tagent_uri\030\002 \001(\tH\000\022\027\n\ragent_"
+          + "content\030\003 \001(\014H\000B\007\n\005agent\"\205\001\n\023RestoreAgen"
+          + "tRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!\022\037dialog"
+          + "flow.googleapis.com/Agent\022\023\n\tagent_uri\030\002"
+          + " \001(\tH\000\022\027\n\ragent_content\030\003 \001(\014H\000B\007\n\005agent"
+          + "\"q\n\032GetValidationResultRequest\0227\n\006parent"
+          + "\030\001 \001(\tB\'\340A\002\372A!\022\037dialogflow.googleapis.co"
+          + "m/Agent\022\032\n\rlanguage_code\030\003 \001(\tB\003\340A\0012\207\022\n\006"
+          + "Agents\022\313\001\n\010GetAgent\0220.google.cloud.dialo"
+          + "gflow.v2beta1.GetAgentRequest\032&.google.c"
+          + "loud.dialogflow.v2beta1.Agent\"e\202\323\344\223\002V\022\"/"
+          + "v2beta1/{parent=projects/*}/agentZ0\022./v2"
           + "beta1/{parent=projects/*/locations/*}/ag"
-          + "ent:restore:\001*\312A/\n\025google.protobuf.Empty"
-          + "\022\026google.protobuf.Struct\022\302\001\n\023GetValidati"
-          + "onResult\022;.google.cloud.dialogflow.v2bet"
-          + "a1.GetValidationResultRequest\0321.google.c"
-          + "loud.dialogflow.v2beta1.ValidationResult"
-          + "\";\202\323\344\223\0025\0223/v2beta1/{parent=projects/*}/a"
-          + "gent/validationResult\032x\312A\031dialogflow.goo"
-          + "gleapis.com\322AYhttps://www.googleapis.com"
-          + "/auth/cloud-platform,https://www.googlea"
-          + "pis.com/auth/dialogflowB\250\001\n#com.google.c"
-          + "loud.dialogflow.v2beta1B\nAgentProtoP\001ZIg"
-          + "oogle.golang.org/genproto/googleapis/clo"
-          + "ud/dialogflow/v2beta1;dialogflow\370\001\001\242\002\002DF"
-          + "\252\002\037Google.Cloud.Dialogflow.V2beta1b\006prot"
-          + "o3"
+          + "ent\332A\006parent\022\344\001\n\010SetAgent\0220.google.cloud"
+          + ".dialogflow.v2beta1.SetAgentRequest\032&.go"
+          + "ogle.cloud.dialogflow.v2beta1.Agent\"~\202\323\344"
+          + "\223\002p\"(/v2beta1/{agent.parent=projects/*}/"
+          + "agent:\005agentZ=\"4/v2beta1/{agent.parent=p"
+          + "rojects/*/locations/*}/agent:\005agent\332A\005ag"
+          + "ent\022\301\001\n\013DeleteAgent\0223.google.cloud.dialo"
+          + "gflow.v2beta1.DeleteAgentRequest\032\026.googl"
+          + "e.protobuf.Empty\"e\202\323\344\223\002V*\"/v2beta1/{pare"
+          + "nt=projects/*}/agentZ0*./v2beta1/{parent"
+          + "=projects/*/locations/*}/agent\332A\006parent\022"
+          + "\360\001\n\014SearchAgents\0224.google.cloud.dialogfl"
+          + "ow.v2beta1.SearchAgentsRequest\0325.google."
+          + "cloud.dialogflow.v2beta1.SearchAgentsRes"
+          + "ponse\"s\202\323\344\223\002d\022)/v2beta1/{parent=projects"
+          + "/*}/agent:searchZ7\0225/v2beta1/{parent=pro"
+          + "jects/*/locations/*}/agent:search\332A\006pare"
+          + "nt\022\213\002\n\nTrainAgent\0222.google.cloud.dialogf"
+          + "low.v2beta1.TrainAgentRequest\032\035.google.l"
+          + "ongrunning.Operation\"\251\001\202\323\344\223\002h\"(/v2beta1/"
+          + "{parent=projects/*}/agent:train:\001*Z9\"4/v"
+          + "2beta1/{parent=projects/*/locations/*}/a"
+          + "gent:train:\001*\332A\006parent\312A/\n\025google.protob"
+          + "uf.Empty\022\026google.protobuf.Struct\022\255\002\n\013Exp"
+          + "ortAgent\0223.google.cloud.dialogflow.v2bet"
+          + "a1.ExportAgentRequest\032\035.google.longrunni"
+          + "ng.Operation\"\311\001\202\323\344\223\002j\")/v2beta1/{parent="
+          + "projects/*}/agent:export:\001*Z:\"5/v2beta1/"
+          + "{parent=projects/*/locations/*}/agent:ex"
+          + "port:\001*\332A\006parent\312AM\n3google.cloud.dialog"
+          + "flow.v2beta1.ExportAgentResponse\022\026google"
+          + ".protobuf.Struct\022\206\002\n\013ImportAgent\0223.googl"
+          + "e.cloud.dialogflow.v2beta1.ImportAgentRe"
+          + "quest\032\035.google.longrunning.Operation\"\242\001\202"
+          + "\323\344\223\002j\")/v2beta1/{parent=projects/*}/agen"
+          + "t:import:\001*Z:\"5/v2beta1/{parent=projects"
+          + "/*/locations/*}/agent:import:\001*\312A/\n\025goog"
+          + "le.protobuf.Empty\022\026google.protobuf.Struc"
+          + "t\022\212\002\n\014RestoreAgent\0224.google.cloud.dialog"
+          + "flow.v2beta1.RestoreAgentRequest\032\035.googl"
+          + "e.longrunning.Operation\"\244\001\202\323\344\223\002l\"*/v2bet"
+          + "a1/{parent=projects/*}/agent:restore:\001*Z"
+          + ";\"6/v2beta1/{parent=projects/*/locations"
+          + "/*}/agent:restore:\001*\312A/\n\025google.protobuf"
+          + ".Empty\022\026google.protobuf.Struct\022\302\001\n\023GetVa"
+          + "lidationResult\022;.google.cloud.dialogflow"
+          + ".v2beta1.GetValidationResultRequest\0321.go"
+          + "ogle.cloud.dialogflow.v2beta1.Validation"
+          + "Result\";\202\323\344\223\0025\0223/v2beta1/{parent=project"
+          + "s/*}/agent/validationResult\032x\312A\031dialogfl"
+          + "ow.googleapis.com\322AYhttps://www.googleap"
+          + "is.com/auth/cloud-platform,https://www.g"
+          + "oogleapis.com/auth/dialogflowB\250\001\n#com.go"
+          + "ogle.cloud.dialogflow.v2beta1B\nAgentProt"
+          + "oP\001ZIgoogle.golang.org/genproto/googleap"
+          + "is/cloud/dialogflow/v2beta1;dialogflow\370\001"
+          + "\001\242\002\002DF\252\002\037Google.Cloud.Dialogflow.V2beta1"
+          + "b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutoApproveSmartMessagingEntriesResponse.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutoApproveSmartMessagingEntriesResponse.java
new file mode 100644
index 000000000..7b52aaa74
--- /dev/null
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutoApproveSmartMessagingEntriesResponse.java
@@ -0,0 +1,753 @@
+/*
+ * 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/v2beta1/document.proto
+
+package com.google.cloud.dialogflow.v2beta1;
+
+/**
+ *
+ *
+ * <pre>
+ * Response message for [Documents.AutoApproveSmartMessagingEntries].
+ * </pre>
+ *
+ * Protobuf type {@code google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse}
+ */
+public final class AutoApproveSmartMessagingEntriesResponse
+    extends com.google.protobuf.GeneratedMessageV3
+    implements
+    // @@protoc_insertion_point(message_implements:google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse)
+    AutoApproveSmartMessagingEntriesResponseOrBuilder {
+  private static final long serialVersionUID = 0L;
+  // Use AutoApproveSmartMessagingEntriesResponse.newBuilder() to construct.
+  private AutoApproveSmartMessagingEntriesResponse(
+      com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+    super(builder);
+  }
+
+  private AutoApproveSmartMessagingEntriesResponse() {}
+
+  @java.lang.Override
+  @SuppressWarnings({"unused"})
+  protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
+    return new AutoApproveSmartMessagingEntriesResponse();
+  }
+
+  @java.lang.Override
+  public final com.google.protobuf.UnknownFieldSet getUnknownFields() {
+    return this.unknownFields;
+  }
+
+  private AutoApproveSmartMessagingEntriesResponse(
+      com.google.protobuf.CodedInputStream input,
+      com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+      throws com.google.protobuf.InvalidProtocolBufferException {
+    this();
+    if (extensionRegistry == null) {
+      throw new java.lang.NullPointerException();
+    }
+    com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+        com.google.protobuf.UnknownFieldSet.newBuilder();
+    try {
+      boolean done = false;
+      while (!done) {
+        int tag = input.readTag();
+        switch (tag) {
+          case 0:
+            done = true;
+            break;
+          case 8:
+            {
+              enabledCount_ = input.readInt32();
+              break;
+            }
+          case 16:
+            {
+              disabledCount_ = input.readInt32();
+              break;
+            }
+          case 24:
+            {
+              unreviewedCount_ = input.readInt32();
+              break;
+            }
+          default:
+            {
+              if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
+                done = true;
+              }
+              break;
+            }
+        }
+      }
+    } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+      throw e.setUnfinishedMessage(this);
+    } catch (java.io.IOException e) {
+      throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this);
+    } finally {
+      this.unknownFields = unknownFields.build();
+      makeExtensionsImmutable();
+    }
+  }
+
+  public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+    return com.google.cloud.dialogflow.v2beta1.DocumentProto
+        .internal_static_google_cloud_dialogflow_v2beta1_AutoApproveSmartMessagingEntriesResponse_descriptor;
+  }
+
+  @java.lang.Override
+  protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internalGetFieldAccessorTable() {
+    return com.google.cloud.dialogflow.v2beta1.DocumentProto
+        .internal_static_google_cloud_dialogflow_v2beta1_AutoApproveSmartMessagingEntriesResponse_fieldAccessorTable
+        .ensureFieldAccessorsInitialized(
+            com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse.class,
+            com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse.Builder
+                .class);
+  }
+
+  public static final int ENABLED_COUNT_FIELD_NUMBER = 1;
+  private int enabledCount_;
+  /**
+   *
+   *
+   * <pre>
+   * Number of smart messaging entries enabled.
+   * </pre>
+   *
+   * <code>int32 enabled_count = 1;</code>
+   *
+   * @return The enabledCount.
+   */
+  @java.lang.Override
+  public int getEnabledCount() {
+    return enabledCount_;
+  }
+
+  public static final int DISABLED_COUNT_FIELD_NUMBER = 2;
+  private int disabledCount_;
+  /**
+   *
+   *
+   * <pre>
+   * Number of smart messaging entries disabled.
+   * </pre>
+   *
+   * <code>int32 disabled_count = 2;</code>
+   *
+   * @return The disabledCount.
+   */
+  @java.lang.Override
+  public int getDisabledCount() {
+    return disabledCount_;
+  }
+
+  public static final int UNREVIEWED_COUNT_FIELD_NUMBER = 3;
+  private int unreviewedCount_;
+  /**
+   *
+   *
+   * <pre>
+   * Number of smart messaging entries unreviewed.
+   * </pre>
+   *
+   * <code>int32 unreviewed_count = 3;</code>
+   *
+   * @return The unreviewedCount.
+   */
+  @java.lang.Override
+  public int getUnreviewedCount() {
+    return unreviewedCount_;
+  }
+
+  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 (enabledCount_ != 0) {
+      output.writeInt32(1, enabledCount_);
+    }
+    if (disabledCount_ != 0) {
+      output.writeInt32(2, disabledCount_);
+    }
+    if (unreviewedCount_ != 0) {
+      output.writeInt32(3, unreviewedCount_);
+    }
+    unknownFields.writeTo(output);
+  }
+
+  @java.lang.Override
+  public int getSerializedSize() {
+    int size = memoizedSize;
+    if (size != -1) return size;
+
+    size = 0;
+    if (enabledCount_ != 0) {
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(1, enabledCount_);
+    }
+    if (disabledCount_ != 0) {
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(2, disabledCount_);
+    }
+    if (unreviewedCount_ != 0) {
+      size += com.google.protobuf.CodedOutputStream.computeInt32Size(3, unreviewedCount_);
+    }
+    size += unknownFields.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.v2beta1.AutoApproveSmartMessagingEntriesResponse)) {
+      return super.equals(obj);
+    }
+    com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse other =
+        (com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse) obj;
+
+    if (getEnabledCount() != other.getEnabledCount()) return false;
+    if (getDisabledCount() != other.getDisabledCount()) return false;
+    if (getUnreviewedCount() != other.getUnreviewedCount()) return false;
+    if (!unknownFields.equals(other.unknownFields)) 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) + ENABLED_COUNT_FIELD_NUMBER;
+    hash = (53 * hash) + getEnabledCount();
+    hash = (37 * hash) + DISABLED_COUNT_FIELD_NUMBER;
+    hash = (53 * hash) + getDisabledCount();
+    hash = (37 * hash) + UNREVIEWED_COUNT_FIELD_NUMBER;
+    hash = (53 * hash) + getUnreviewedCount();
+    hash = (29 * hash) + unknownFields.hashCode();
+    memoizedHashCode = hash;
+    return hash;
+  }
+
+  public static com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      parseFrom(java.nio.ByteBuffer data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      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.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      parseFrom(com.google.protobuf.ByteString data)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      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.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data);
+  }
+
+  public static com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      parseFrom(byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+          throws com.google.protobuf.InvalidProtocolBufferException {
+    return PARSER.parseFrom(data, extensionRegistry);
+  }
+
+  public static com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      parseFrom(java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      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.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
+  }
+
+  public static com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      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.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException {
+    return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
+  }
+
+  public static com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      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.v2beta1.AutoApproveSmartMessagingEntriesResponse 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>
+   * Response message for [Documents.AutoApproveSmartMessagingEntries].
+   * </pre>
+   *
+   * Protobuf type {@code google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse}
+   */
+  public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
+      implements
+      // @@protoc_insertion_point(builder_implements:google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse)
+      com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponseOrBuilder {
+    public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
+      return com.google.cloud.dialogflow.v2beta1.DocumentProto
+          .internal_static_google_cloud_dialogflow_v2beta1_AutoApproveSmartMessagingEntriesResponse_descriptor;
+    }
+
+    @java.lang.Override
+    protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+        internalGetFieldAccessorTable() {
+      return com.google.cloud.dialogflow.v2beta1.DocumentProto
+          .internal_static_google_cloud_dialogflow_v2beta1_AutoApproveSmartMessagingEntriesResponse_fieldAccessorTable
+          .ensureFieldAccessorsInitialized(
+              com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse.class,
+              com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse.Builder
+                  .class);
+    }
+
+    // Construct using
+    // com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse.newBuilder()
+    private Builder() {
+      maybeForceBuilderInitialization();
+    }
+
+    private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+      super(parent);
+      maybeForceBuilderInitialization();
+    }
+
+    private void maybeForceBuilderInitialization() {
+      if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {}
+    }
+
+    @java.lang.Override
+    public Builder clear() {
+      super.clear();
+      enabledCount_ = 0;
+
+      disabledCount_ = 0;
+
+      unreviewedCount_ = 0;
+
+      return this;
+    }
+
+    @java.lang.Override
+    public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() {
+      return com.google.cloud.dialogflow.v2beta1.DocumentProto
+          .internal_static_google_cloud_dialogflow_v2beta1_AutoApproveSmartMessagingEntriesResponse_descriptor;
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+        getDefaultInstanceForType() {
+      return com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+          .getDefaultInstance();
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse build() {
+      com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse result =
+          buildPartial();
+      if (!result.isInitialized()) {
+        throw newUninitializedMessageException(result);
+      }
+      return result;
+    }
+
+    @java.lang.Override
+    public com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+        buildPartial() {
+      com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse result =
+          new com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse(this);
+      result.enabledCount_ = enabledCount_;
+      result.disabledCount_ = disabledCount_;
+      result.unreviewedCount_ = unreviewedCount_;
+      onBuilt();
+      return result;
+    }
+
+    @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.v2beta1.AutoApproveSmartMessagingEntriesResponse) {
+        return mergeFrom(
+            (com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse) other);
+      } else {
+        super.mergeFrom(other);
+        return this;
+      }
+    }
+
+    public Builder mergeFrom(
+        com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse other) {
+      if (other
+          == com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+              .getDefaultInstance()) return this;
+      if (other.getEnabledCount() != 0) {
+        setEnabledCount(other.getEnabledCount());
+      }
+      if (other.getDisabledCount() != 0) {
+        setDisabledCount(other.getDisabledCount());
+      }
+      if (other.getUnreviewedCount() != 0) {
+        setUnreviewedCount(other.getUnreviewedCount());
+      }
+      this.mergeUnknownFields(other.unknownFields);
+      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 {
+      com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse parsedMessage =
+          null;
+      try {
+        parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+      } catch (com.google.protobuf.InvalidProtocolBufferException e) {
+        parsedMessage =
+            (com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse)
+                e.getUnfinishedMessage();
+        throw e.unwrapIOException();
+      } finally {
+        if (parsedMessage != null) {
+          mergeFrom(parsedMessage);
+        }
+      }
+      return this;
+    }
+
+    private int enabledCount_;
+    /**
+     *
+     *
+     * <pre>
+     * Number of smart messaging entries enabled.
+     * </pre>
+     *
+     * <code>int32 enabled_count = 1;</code>
+     *
+     * @return The enabledCount.
+     */
+    @java.lang.Override
+    public int getEnabledCount() {
+      return enabledCount_;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Number of smart messaging entries enabled.
+     * </pre>
+     *
+     * <code>int32 enabled_count = 1;</code>
+     *
+     * @param value The enabledCount to set.
+     * @return This builder for chaining.
+     */
+    public Builder setEnabledCount(int value) {
+
+      enabledCount_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Number of smart messaging entries enabled.
+     * </pre>
+     *
+     * <code>int32 enabled_count = 1;</code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearEnabledCount() {
+
+      enabledCount_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private int disabledCount_;
+    /**
+     *
+     *
+     * <pre>
+     * Number of smart messaging entries disabled.
+     * </pre>
+     *
+     * <code>int32 disabled_count = 2;</code>
+     *
+     * @return The disabledCount.
+     */
+    @java.lang.Override
+    public int getDisabledCount() {
+      return disabledCount_;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Number of smart messaging entries disabled.
+     * </pre>
+     *
+     * <code>int32 disabled_count = 2;</code>
+     *
+     * @param value The disabledCount to set.
+     * @return This builder for chaining.
+     */
+    public Builder setDisabledCount(int value) {
+
+      disabledCount_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Number of smart messaging entries disabled.
+     * </pre>
+     *
+     * <code>int32 disabled_count = 2;</code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearDisabledCount() {
+
+      disabledCount_ = 0;
+      onChanged();
+      return this;
+    }
+
+    private int unreviewedCount_;
+    /**
+     *
+     *
+     * <pre>
+     * Number of smart messaging entries unreviewed.
+     * </pre>
+     *
+     * <code>int32 unreviewed_count = 3;</code>
+     *
+     * @return The unreviewedCount.
+     */
+    @java.lang.Override
+    public int getUnreviewedCount() {
+      return unreviewedCount_;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Number of smart messaging entries unreviewed.
+     * </pre>
+     *
+     * <code>int32 unreviewed_count = 3;</code>
+     *
+     * @param value The unreviewedCount to set.
+     * @return This builder for chaining.
+     */
+    public Builder setUnreviewedCount(int value) {
+
+      unreviewedCount_ = value;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Number of smart messaging entries unreviewed.
+     * </pre>
+     *
+     * <code>int32 unreviewed_count = 3;</code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearUnreviewedCount() {
+
+      unreviewedCount_ = 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.v2beta1.AutoApproveSmartMessagingEntriesResponse)
+  }
+
+  // @@protoc_insertion_point(class_scope:google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse)
+  private static final com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      DEFAULT_INSTANCE;
+
+  static {
+    DEFAULT_INSTANCE =
+        new com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse();
+  }
+
+  public static com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      getDefaultInstance() {
+    return DEFAULT_INSTANCE;
+  }
+
+  private static final com.google.protobuf.Parser<AutoApproveSmartMessagingEntriesResponse> PARSER =
+      new com.google.protobuf.AbstractParser<AutoApproveSmartMessagingEntriesResponse>() {
+        @java.lang.Override
+        public AutoApproveSmartMessagingEntriesResponse parsePartialFrom(
+            com.google.protobuf.CodedInputStream input,
+            com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+            throws com.google.protobuf.InvalidProtocolBufferException {
+          return new AutoApproveSmartMessagingEntriesResponse(input, extensionRegistry);
+        }
+      };
+
+  public static com.google.protobuf.Parser<AutoApproveSmartMessagingEntriesResponse> parser() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.protobuf.Parser<AutoApproveSmartMessagingEntriesResponse> getParserForType() {
+    return PARSER;
+  }
+
+  @java.lang.Override
+  public com.google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse
+      getDefaultInstanceForType() {
+    return DEFAULT_INSTANCE;
+  }
+}
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutoApproveSmartMessagingEntriesResponseOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutoApproveSmartMessagingEntriesResponseOrBuilder.java
new file mode 100644
index 000000000..dd0f5e7c1
--- /dev/null
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/AutoApproveSmartMessagingEntriesResponseOrBuilder.java
@@ -0,0 +1,64 @@
+/*
+ * 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/v2beta1/document.proto
+
+package com.google.cloud.dialogflow.v2beta1;
+
+public interface AutoApproveSmartMessagingEntriesResponseOrBuilder
+    extends
+    // @@protoc_insertion_point(interface_extends:google.cloud.dialogflow.v2beta1.AutoApproveSmartMessagingEntriesResponse)
+    com.google.protobuf.MessageOrBuilder {
+
+  /**
+   *
+   *
+   * <pre>
+   * Number of smart messaging entries enabled.
+   * </pre>
+   *
+   * <code>int32 enabled_count = 1;</code>
+   *
+   * @return The enabledCount.
+   */
+  int getEnabledCount();
+
+  /**
+   *
+   *
+   * <pre>
+   * Number of smart messaging entries disabled.
+   * </pre>
+   *
+   * <code>int32 disabled_count = 2;</code>
+   *
+   * @return The disabledCount.
+   */
+  int getDisabledCount();
+
+  /**
+   *
+   *
+   * <pre>
+   * Number of smart messaging entries unreviewed.
+   * </pre>
+   *
+   * <code>int32 unreviewed_count = 3;</code>
+   *
+   * @return The unreviewedCount.
+   */
+  int getUnreviewedCount();
+}
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java
index 4030a46e6..f7d13d7a0 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequest.java
@@ -202,7 +202,9 @@ public com.google.protobuf.ByteString getParentBytes() {
    * Required. The entities to create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> getEntitiesList() {
@@ -215,7 +217,9 @@ public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> get
    * Required. The entities to create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public java.util.List<? extends com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>
@@ -229,7 +233,9 @@ public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> get
    * Required. The entities to create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public int getEntitiesCount() {
@@ -242,7 +248,9 @@ public int getEntitiesCount() {
    * Required. The entities to create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EntityType.Entity getEntities(int index) {
@@ -255,7 +263,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity getEntities(int ind
    * Required. The entities to create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitiesOrBuilder(
@@ -862,7 +872,9 @@ private void ensureEntitiesIsMutable() {
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> getEntitiesList() {
       if (entitiesBuilder_ == null) {
@@ -878,7 +890,9 @@ public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> get
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public int getEntitiesCount() {
       if (entitiesBuilder_ == null) {
@@ -894,7 +908,9 @@ public int getEntitiesCount() {
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.Entity getEntities(int index) {
       if (entitiesBuilder_ == null) {
@@ -910,7 +926,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity getEntities(int ind
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setEntities(
         int index, com.google.cloud.dialogflow.v2beta1.EntityType.Entity value) {
@@ -933,7 +951,9 @@ public Builder setEntities(
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setEntities(
         int index, com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder builderForValue) {
@@ -953,7 +973,9 @@ public Builder setEntities(
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addEntities(com.google.cloud.dialogflow.v2beta1.EntityType.Entity value) {
       if (entitiesBuilder_ == null) {
@@ -975,7 +997,9 @@ public Builder addEntities(com.google.cloud.dialogflow.v2beta1.EntityType.Entity
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addEntities(
         int index, com.google.cloud.dialogflow.v2beta1.EntityType.Entity value) {
@@ -998,7 +1022,9 @@ public Builder addEntities(
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addEntities(
         com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder builderForValue) {
@@ -1018,7 +1044,9 @@ public Builder addEntities(
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addEntities(
         int index, com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder builderForValue) {
@@ -1038,7 +1066,9 @@ public Builder addEntities(
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addAllEntities(
         java.lang.Iterable<? extends com.google.cloud.dialogflow.v2beta1.EntityType.Entity>
@@ -1059,7 +1089,9 @@ public Builder addAllEntities(
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder clearEntities() {
       if (entitiesBuilder_ == null) {
@@ -1078,7 +1110,9 @@ public Builder clearEntities() {
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder removeEntities(int index) {
       if (entitiesBuilder_ == null) {
@@ -1097,7 +1131,9 @@ public Builder removeEntities(int index) {
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder getEntitiesBuilder(
         int index) {
@@ -1110,7 +1146,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder getEntities
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitiesOrBuilder(
         int index) {
@@ -1127,7 +1165,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitie
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public java.util.List<? extends com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>
         getEntitiesOrBuilderList() {
@@ -1144,7 +1184,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitie
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntitiesBuilder() {
       return getEntitiesFieldBuilder()
@@ -1157,7 +1199,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntitiesBuilder(
         int index) {
@@ -1172,7 +1216,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities
      * Required. The entities to create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder>
         getEntitiesBuilderList() {
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequestOrBuilder.java
index 5b2a7d9bc..4d6104744 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchCreateEntitiesRequestOrBuilder.java
@@ -61,7 +61,9 @@ public interface BatchCreateEntitiesRequestOrBuilder
    * Required. The entities to create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> getEntitiesList();
   /**
@@ -71,7 +73,9 @@ public interface BatchCreateEntitiesRequestOrBuilder
    * Required. The entities to create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.EntityType.Entity getEntities(int index);
   /**
@@ -81,7 +85,9 @@ public interface BatchCreateEntitiesRequestOrBuilder
    * Required. The entities to create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   int getEntitiesCount();
   /**
@@ -91,7 +97,9 @@ public interface BatchCreateEntitiesRequestOrBuilder
    * Required. The entities to create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   java.util.List<? extends com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>
       getEntitiesOrBuilderList();
@@ -102,7 +110,9 @@ public interface BatchCreateEntitiesRequestOrBuilder
    * Required. The entities to create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitiesOrBuilder(int index);
 
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java
index 620d9b316..0114f7a12 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequest.java
@@ -200,7 +200,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    * `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>repeated string entity_values = 2;</code>
+   * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @return A list containing the entityValues.
    */
@@ -216,7 +216,7 @@ public com.google.protobuf.ProtocolStringList getEntityValuesList() {
    * `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>repeated string entity_values = 2;</code>
+   * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @return The count of entityValues.
    */
@@ -232,7 +232,7 @@ public int getEntityValuesCount() {
    * `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>repeated string entity_values = 2;</code>
+   * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @param index The index of the element to return.
    * @return The entityValues at the given index.
@@ -249,7 +249,7 @@ public java.lang.String getEntityValues(int index) {
    * `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>repeated string entity_values = 2;</code>
+   * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @param index The index of the value to return.
    * @return The bytes of the entityValues at the given index.
@@ -828,7 +828,7 @@ private void ensureEntityValuesIsMutable() {
      * `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>repeated string entity_values = 2;</code>
+     * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @return A list containing the entityValues.
      */
@@ -844,7 +844,7 @@ public com.google.protobuf.ProtocolStringList getEntityValuesList() {
      * `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>repeated string entity_values = 2;</code>
+     * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @return The count of entityValues.
      */
@@ -860,7 +860,7 @@ public int getEntityValuesCount() {
      * `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>repeated string entity_values = 2;</code>
+     * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @param index The index of the element to return.
      * @return The entityValues at the given index.
@@ -877,7 +877,7 @@ public java.lang.String getEntityValues(int index) {
      * `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>repeated string entity_values = 2;</code>
+     * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @param index The index of the value to return.
      * @return The bytes of the entityValues at the given index.
@@ -894,7 +894,7 @@ public com.google.protobuf.ByteString getEntityValuesBytes(int index) {
      * `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>repeated string entity_values = 2;</code>
+     * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @param index The index to set the value at.
      * @param value The entityValues to set.
@@ -918,7 +918,7 @@ public Builder setEntityValues(int index, java.lang.String value) {
      * `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>repeated string entity_values = 2;</code>
+     * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @param value The entityValues to add.
      * @return This builder for chaining.
@@ -941,7 +941,7 @@ public Builder addEntityValues(java.lang.String value) {
      * `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>repeated string entity_values = 2;</code>
+     * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @param values The entityValues to add.
      * @return This builder for chaining.
@@ -961,7 +961,7 @@ public Builder addAllEntityValues(java.lang.Iterable<java.lang.String> values) {
      * `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>repeated string entity_values = 2;</code>
+     * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @return This builder for chaining.
      */
@@ -980,7 +980,7 @@ public Builder clearEntityValues() {
      * `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>repeated string entity_values = 2;</code>
+     * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @param value The bytes of the entityValues to add.
      * @return This builder for chaining.
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequestOrBuilder.java
index e62d4b345..3dc84ce1d 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteEntitiesRequestOrBuilder.java
@@ -63,7 +63,7 @@ public interface BatchDeleteEntitiesRequestOrBuilder
    * `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>repeated string entity_values = 2;</code>
+   * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @return A list containing the entityValues.
    */
@@ -77,7 +77,7 @@ public interface BatchDeleteEntitiesRequestOrBuilder
    * `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>repeated string entity_values = 2;</code>
+   * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @return The count of entityValues.
    */
@@ -91,7 +91,7 @@ public interface BatchDeleteEntitiesRequestOrBuilder
    * `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>repeated string entity_values = 2;</code>
+   * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @param index The index of the element to return.
    * @return The entityValues at the given index.
@@ -106,7 +106,7 @@ public interface BatchDeleteEntitiesRequestOrBuilder
    * `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>repeated string entity_values = 2;</code>
+   * <code>repeated string entity_values = 2 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @param index The index of the value to return.
    * @return The bytes of the entityValues at the given index.
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java
index 514888f6c..7bb2ae859 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequest.java
@@ -192,7 +192,9 @@ public com.google.protobuf.ByteString getParentBytes() {
    * filled in.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public java.util.List<com.google.cloud.dialogflow.v2beta1.Intent> getIntentsList() {
@@ -206,7 +208,9 @@ public java.util.List<com.google.cloud.dialogflow.v2beta1.Intent> getIntentsList
    * filled in.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public java.util.List<? extends com.google.cloud.dialogflow.v2beta1.IntentOrBuilder>
@@ -221,7 +225,9 @@ public java.util.List<com.google.cloud.dialogflow.v2beta1.Intent> getIntentsList
    * filled in.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public int getIntentsCount() {
@@ -235,7 +241,9 @@ public int getIntentsCount() {
    * filled in.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.Intent getIntents(int index) {
@@ -249,7 +257,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent getIntents(int index) {
    * filled in.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentsOrBuilder(int index) {
@@ -781,7 +791,9 @@ private void ensureIntentsIsMutable() {
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public java.util.List<com.google.cloud.dialogflow.v2beta1.Intent> getIntentsList() {
       if (intentsBuilder_ == null) {
@@ -798,7 +810,9 @@ public java.util.List<com.google.cloud.dialogflow.v2beta1.Intent> getIntentsList
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public int getIntentsCount() {
       if (intentsBuilder_ == null) {
@@ -815,7 +829,9 @@ public int getIntentsCount() {
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Intent getIntents(int index) {
       if (intentsBuilder_ == null) {
@@ -832,7 +848,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent getIntents(int index) {
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setIntents(int index, com.google.cloud.dialogflow.v2beta1.Intent value) {
       if (intentsBuilder_ == null) {
@@ -855,7 +873,9 @@ public Builder setIntents(int index, com.google.cloud.dialogflow.v2beta1.Intent
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setIntents(
         int index, com.google.cloud.dialogflow.v2beta1.Intent.Builder builderForValue) {
@@ -876,7 +896,9 @@ public Builder setIntents(
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addIntents(com.google.cloud.dialogflow.v2beta1.Intent value) {
       if (intentsBuilder_ == null) {
@@ -899,7 +921,9 @@ public Builder addIntents(com.google.cloud.dialogflow.v2beta1.Intent value) {
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addIntents(int index, com.google.cloud.dialogflow.v2beta1.Intent value) {
       if (intentsBuilder_ == null) {
@@ -922,7 +946,9 @@ public Builder addIntents(int index, com.google.cloud.dialogflow.v2beta1.Intent
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addIntents(com.google.cloud.dialogflow.v2beta1.Intent.Builder builderForValue) {
       if (intentsBuilder_ == null) {
@@ -942,7 +968,9 @@ public Builder addIntents(com.google.cloud.dialogflow.v2beta1.Intent.Builder bui
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addIntents(
         int index, com.google.cloud.dialogflow.v2beta1.Intent.Builder builderForValue) {
@@ -963,7 +991,9 @@ public Builder addIntents(
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addAllIntents(
         java.lang.Iterable<? extends com.google.cloud.dialogflow.v2beta1.Intent> values) {
@@ -984,7 +1014,9 @@ public Builder addAllIntents(
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder clearIntents() {
       if (intentsBuilder_ == null) {
@@ -1004,7 +1036,9 @@ public Builder clearIntents() {
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder removeIntents(int index) {
       if (intentsBuilder_ == null) {
@@ -1024,7 +1058,9 @@ public Builder removeIntents(int index) {
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Intent.Builder getIntentsBuilder(int index) {
       return getIntentsFieldBuilder().getBuilder(index);
@@ -1037,7 +1073,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder getIntentsBuilder(int
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentsOrBuilder(int index) {
       if (intentsBuilder_ == null) {
@@ -1054,7 +1092,9 @@ public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentsOrBuilder(i
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public java.util.List<? extends com.google.cloud.dialogflow.v2beta1.IntentOrBuilder>
         getIntentsOrBuilderList() {
@@ -1072,7 +1112,9 @@ public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentsOrBuilder(i
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder() {
       return getIntentsFieldBuilder()
@@ -1086,7 +1128,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder() {
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder(int index) {
       return getIntentsFieldBuilder()
@@ -1100,7 +1144,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder addIntentsBuilder(int
      * filled in.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public java.util.List<com.google.cloud.dialogflow.v2beta1.Intent.Builder>
         getIntentsBuilderList() {
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequestOrBuilder.java
index 10513473b..bc45012e5 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchDeleteIntentsRequestOrBuilder.java
@@ -62,7 +62,9 @@ public interface BatchDeleteIntentsRequestOrBuilder
    * filled in.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   java.util.List<com.google.cloud.dialogflow.v2beta1.Intent> getIntentsList();
   /**
@@ -73,7 +75,9 @@ public interface BatchDeleteIntentsRequestOrBuilder
    * filled in.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.Intent getIntents(int index);
   /**
@@ -84,7 +88,9 @@ public interface BatchDeleteIntentsRequestOrBuilder
    * filled in.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   int getIntentsCount();
   /**
@@ -95,7 +101,9 @@ public interface BatchDeleteIntentsRequestOrBuilder
    * filled in.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   java.util.List<? extends com.google.cloud.dialogflow.v2beta1.IntentOrBuilder>
       getIntentsOrBuilderList();
@@ -107,7 +115,9 @@ public interface BatchDeleteIntentsRequestOrBuilder
    * filled in.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.Intent intents = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentsOrBuilder(int index);
 }
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java
index 1f6a09dec..50ce3d62e 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequest.java
@@ -217,7 +217,9 @@ public com.google.protobuf.ByteString getParentBytes() {
    * Required. The entities to update or create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> getEntitiesList() {
@@ -230,7 +232,9 @@ public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> get
    * Required. The entities to update or create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public java.util.List<? extends com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>
@@ -244,7 +248,9 @@ public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> get
    * Required. The entities to update or create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public int getEntitiesCount() {
@@ -257,7 +263,9 @@ public int getEntitiesCount() {
    * Required. The entities to update or create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EntityType.Entity getEntities(int index) {
@@ -270,7 +278,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity getEntities(int ind
    * Required. The entities to update or create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitiesOrBuilder(
@@ -951,7 +961,9 @@ private void ensureEntitiesIsMutable() {
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> getEntitiesList() {
       if (entitiesBuilder_ == null) {
@@ -967,7 +979,9 @@ public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> get
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public int getEntitiesCount() {
       if (entitiesBuilder_ == null) {
@@ -983,7 +997,9 @@ public int getEntitiesCount() {
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.Entity getEntities(int index) {
       if (entitiesBuilder_ == null) {
@@ -999,7 +1015,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity getEntities(int ind
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setEntities(
         int index, com.google.cloud.dialogflow.v2beta1.EntityType.Entity value) {
@@ -1022,7 +1040,9 @@ public Builder setEntities(
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setEntities(
         int index, com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder builderForValue) {
@@ -1042,7 +1062,9 @@ public Builder setEntities(
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addEntities(com.google.cloud.dialogflow.v2beta1.EntityType.Entity value) {
       if (entitiesBuilder_ == null) {
@@ -1064,7 +1086,9 @@ public Builder addEntities(com.google.cloud.dialogflow.v2beta1.EntityType.Entity
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addEntities(
         int index, com.google.cloud.dialogflow.v2beta1.EntityType.Entity value) {
@@ -1087,7 +1111,9 @@ public Builder addEntities(
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addEntities(
         com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder builderForValue) {
@@ -1107,7 +1133,9 @@ public Builder addEntities(
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addEntities(
         int index, com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder builderForValue) {
@@ -1127,7 +1155,9 @@ public Builder addEntities(
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder addAllEntities(
         java.lang.Iterable<? extends com.google.cloud.dialogflow.v2beta1.EntityType.Entity>
@@ -1148,7 +1178,9 @@ public Builder addAllEntities(
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder clearEntities() {
       if (entitiesBuilder_ == null) {
@@ -1167,7 +1199,9 @@ public Builder clearEntities() {
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder removeEntities(int index) {
       if (entitiesBuilder_ == null) {
@@ -1186,7 +1220,9 @@ public Builder removeEntities(int index) {
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder getEntitiesBuilder(
         int index) {
@@ -1199,7 +1235,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder getEntities
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitiesOrBuilder(
         int index) {
@@ -1216,7 +1254,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitie
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public java.util.List<? extends com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>
         getEntitiesOrBuilderList() {
@@ -1233,7 +1273,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitie
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntitiesBuilder() {
       return getEntitiesFieldBuilder()
@@ -1246,7 +1288,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntitiesBuilder(
         int index) {
@@ -1261,7 +1305,9 @@ public com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder addEntities
      * Required. The entities to update or create.
      * </pre>
      *
-     * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+     * <code>
+     * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity.Builder>
         getEntitiesBuilderList() {
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequestOrBuilder.java
index c6470358c..e9a1e17a2 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/BatchUpdateEntitiesRequestOrBuilder.java
@@ -61,7 +61,9 @@ public interface BatchUpdateEntitiesRequestOrBuilder
    * Required. The entities to update or create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   java.util.List<com.google.cloud.dialogflow.v2beta1.EntityType.Entity> getEntitiesList();
   /**
@@ -71,7 +73,9 @@ public interface BatchUpdateEntitiesRequestOrBuilder
    * Required. The entities to update or create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.EntityType.Entity getEntities(int index);
   /**
@@ -81,7 +85,9 @@ public interface BatchUpdateEntitiesRequestOrBuilder
    * Required. The entities to update or create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   int getEntitiesCount();
   /**
@@ -91,7 +97,9 @@ public interface BatchUpdateEntitiesRequestOrBuilder
    * Required. The entities to update or create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   java.util.List<? extends com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder>
       getEntitiesOrBuilderList();
@@ -102,7 +110,9 @@ public interface BatchUpdateEntitiesRequestOrBuilder
    * Required. The entities to update or create.
    * </pre>
    *
-   * <code>repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2;</code>
+   * <code>
+   * repeated .google.cloud.dialogflow.v2beta1.EntityType.Entity entities = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.EntityType.EntityOrBuilder getEntitiesOrBuilder(int index);
 
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextName.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextName.java
index c95de0f8e..d9d3fe2f6 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextName.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextName.java
@@ -16,27 +16,44 @@
 
 package com.google.cloud.dialogflow.v2beta1;
 
+import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /** AUTO-GENERATED DOCUMENTATION AND CLASS */
 @javax.annotation.Generated("by GAPIC protoc plugin")
 public class ContextName implements ResourceName {
 
-  private static final PathTemplate PATH_TEMPLATE =
+  @Deprecated
+  protected ContextName() {}
+
+  private static final PathTemplate PROJECT_SESSION_CONTEXT_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding(
           "projects/{project}/agent/sessions/{session}/contexts/{context}");
+  private static final PathTemplate PROJECT_ENVIRONMENT_USER_SESSION_CONTEXT_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/agent/environments/{environment}/users/{user}/sessions/{session}/contexts/{context}");
+  private static final PathTemplate PROJECT_LOCATION_SESSION_CONTEXT_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/locations/{location}/agent/sessions/{session}/contexts/{context}");
 
   private volatile Map<String, String> fieldValuesMap;
+  private PathTemplate pathTemplate;
+  private String fixedValue;
 
-  private final String project;
-  private final String session;
-  private final String context;
+  private String project;
+  private String session;
+  private String context;
+  private String environment;
+  private String user;
+  private String location;
 
   public String getProject() {
     return project;
@@ -50,22 +67,105 @@ public String getContext() {
     return context;
   }
 
-  public static Builder newBuilder() {
-    return new Builder();
+  public String getEnvironment() {
+    return environment;
   }
 
-  public Builder toBuilder() {
-    return new Builder(this);
+  public String getUser() {
+    return user;
+  }
+
+  public String getLocation() {
+    return location;
   }
 
   private ContextName(Builder builder) {
     project = Preconditions.checkNotNull(builder.getProject());
     session = Preconditions.checkNotNull(builder.getSession());
     context = Preconditions.checkNotNull(builder.getContext());
+    pathTemplate = PROJECT_SESSION_CONTEXT_PATH_TEMPLATE;
+  }
+
+  private ContextName(ProjectEnvironmentUserSessionContextBuilder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    environment = Preconditions.checkNotNull(builder.getEnvironment());
+    user = Preconditions.checkNotNull(builder.getUser());
+    session = Preconditions.checkNotNull(builder.getSession());
+    context = Preconditions.checkNotNull(builder.getContext());
+    pathTemplate = PROJECT_ENVIRONMENT_USER_SESSION_CONTEXT_PATH_TEMPLATE;
+  }
+
+  private ContextName(ProjectLocationSessionContextBuilder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    session = Preconditions.checkNotNull(builder.getSession());
+    context = Preconditions.checkNotNull(builder.getContext());
+    pathTemplate = PROJECT_LOCATION_SESSION_CONTEXT_PATH_TEMPLATE;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static Builder newProjectSessionContextBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static ProjectEnvironmentUserSessionContextBuilder
+      newProjectEnvironmentUserSessionContextBuilder() {
+    return new ProjectEnvironmentUserSessionContextBuilder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static ProjectLocationSessionContextBuilder newProjectLocationSessionContextBuilder() {
+    return new ProjectLocationSessionContextBuilder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
   }
 
   public static ContextName of(String project, String session, String context) {
-    return newBuilder().setProject(project).setSession(session).setContext(context).build();
+    return newProjectSessionContextBuilder()
+        .setProject(project)
+        .setSession(session)
+        .setContext(context)
+        .build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static ContextName ofProjectSessionContextName(
+      String project, String session, String context) {
+    return newProjectSessionContextBuilder()
+        .setProject(project)
+        .setSession(session)
+        .setContext(context)
+        .build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static ContextName ofProjectEnvironmentUserSessionContextName(
+      String project, String environment, String user, String session, String context) {
+    return newProjectEnvironmentUserSessionContextBuilder()
+        .setProject(project)
+        .setEnvironment(environment)
+        .setUser(user)
+        .setSession(session)
+        .setContext(context)
+        .build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static ContextName ofProjectLocationSessionContextName(
+      String project, String location, String session, String context) {
+    return newProjectLocationSessionContextBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setSession(session)
+        .setContext(context)
+        .build();
   }
 
   public static String format(String project, String session, String context) {
@@ -77,14 +177,69 @@ public static String format(String project, String session, String context) {
         .toString();
   }
 
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectSessionContextName(
+      String project, String session, String context) {
+    return newBuilder()
+        .setProject(project)
+        .setSession(session)
+        .setContext(context)
+        .build()
+        .toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectEnvironmentUserSessionContextName(
+      String project, String environment, String user, String session, String context) {
+    return newProjectEnvironmentUserSessionContextBuilder()
+        .setProject(project)
+        .setEnvironment(environment)
+        .setUser(user)
+        .setSession(session)
+        .setContext(context)
+        .build()
+        .toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectLocationSessionContextName(
+      String project, String location, String session, String context) {
+    return newProjectLocationSessionContextBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setSession(session)
+        .setContext(context)
+        .build()
+        .toString();
+  }
+
   public static ContextName parse(String formattedString) {
     if (formattedString.isEmpty()) {
       return null;
     }
-    Map<String, String> matchMap =
-        PATH_TEMPLATE.validatedMatch(
-            formattedString, "ContextName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("session"), matchMap.get("context"));
+    if (PROJECT_SESSION_CONTEXT_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap = PROJECT_SESSION_CONTEXT_PATH_TEMPLATE.match(formattedString);
+      return ofProjectSessionContextName(
+          matchMap.get("project"), matchMap.get("session"), matchMap.get("context"));
+    } else if (PROJECT_ENVIRONMENT_USER_SESSION_CONTEXT_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap =
+          PROJECT_ENVIRONMENT_USER_SESSION_CONTEXT_PATH_TEMPLATE.match(formattedString);
+      return ofProjectEnvironmentUserSessionContextName(
+          matchMap.get("project"),
+          matchMap.get("environment"),
+          matchMap.get("user"),
+          matchMap.get("session"),
+          matchMap.get("context"));
+    } else if (PROJECT_LOCATION_SESSION_CONTEXT_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap =
+          PROJECT_LOCATION_SESSION_CONTEXT_PATH_TEMPLATE.match(formattedString);
+      return ofProjectLocationSessionContextName(
+          matchMap.get("project"),
+          matchMap.get("location"),
+          matchMap.get("session"),
+          matchMap.get("context"));
+    }
+    throw new ValidationException("JobName.parse: formattedString not in valid format");
   }
 
   public static List<ContextName> parseList(List<String> formattedStrings) {
@@ -96,7 +251,7 @@ public static List<ContextName> parseList(List<String> formattedStrings) {
   }
 
   public static List<String> toStringList(List<ContextName> values) {
-    List<String> list = new ArrayList<String>(values.size());
+    List<String> list = new ArrayList<>(values.size());
     for (ContextName value : values) {
       if (value == null) {
         list.add("");
@@ -108,17 +263,35 @@ public static List<String> toStringList(List<ContextName> values) {
   }
 
   public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
+    return PROJECT_SESSION_CONTEXT_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_ENVIRONMENT_USER_SESSION_CONTEXT_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_LOCATION_SESSION_CONTEXT_PATH_TEMPLATE.matches(formattedString);
   }
 
+  @Override
   public Map<String, String> getFieldValuesMap() {
     if (fieldValuesMap == null) {
       synchronized (this) {
         if (fieldValuesMap == null) {
           ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("project", project);
-          fieldMapBuilder.put("session", session);
-          fieldMapBuilder.put("context", context);
+          if (project != null) {
+            fieldMapBuilder.put("project", project);
+          }
+          if (session != null) {
+            fieldMapBuilder.put("session", session);
+          }
+          if (context != null) {
+            fieldMapBuilder.put("context", context);
+          }
+          if (environment != null) {
+            fieldMapBuilder.put("environment", environment);
+          }
+          if (user != null) {
+            fieldMapBuilder.put("user", user);
+          }
+          if (location != null) {
+            fieldMapBuilder.put("location", location);
+          }
           fieldValuesMap = fieldMapBuilder.build();
         }
       }
@@ -132,16 +305,18 @@ public String getFieldValue(String fieldName) {
 
   @Override
   public String toString() {
-    return PATH_TEMPLATE.instantiate("project", project, "session", session, "context", context);
+    return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
   }
 
-  /** Builder for ContextName. */
+  /** Builder for projects/{project}/agent/sessions/{session}/contexts/{context}. */
   public static class Builder {
 
     private String project;
     private String session;
     private String context;
 
+    protected Builder() {}
+
     public String getProject() {
       return project;
     }
@@ -169,9 +344,11 @@ public Builder setContext(String context) {
       return this;
     }
 
-    private Builder() {}
-
     private Builder(ContextName contextName) {
+      Preconditions.checkArgument(
+          contextName.pathTemplate == PROJECT_SESSION_CONTEXT_PATH_TEMPLATE,
+          "toBuilder is only supported when ContextName has the pattern of "
+              + "projects/{project}/agent/sessions/{session}/contexts/{context}.");
       project = contextName.project;
       session = contextName.session;
       context = contextName.context;
@@ -182,16 +359,139 @@ public ContextName build() {
     }
   }
 
+  /**
+   * Builder for
+   * projects/{project}/agent/environments/{environment}/users/{user}/sessions/{session}/contexts/{context}.
+   */
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static class ProjectEnvironmentUserSessionContextBuilder {
+
+    private String project;
+    private String environment;
+    private String user;
+    private String session;
+    private String context;
+
+    private ProjectEnvironmentUserSessionContextBuilder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getEnvironment() {
+      return environment;
+    }
+
+    public String getUser() {
+      return user;
+    }
+
+    public String getSession() {
+      return session;
+    }
+
+    public String getContext() {
+      return context;
+    }
+
+    public ProjectEnvironmentUserSessionContextBuilder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionContextBuilder setEnvironment(String environment) {
+      this.environment = environment;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionContextBuilder setUser(String user) {
+      this.user = user;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionContextBuilder setSession(String session) {
+      this.session = session;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionContextBuilder setContext(String context) {
+      this.context = context;
+      return this;
+    }
+
+    public ContextName build() {
+      return new ContextName(this);
+    }
+  }
+
+  /**
+   * Builder for
+   * projects/{project}/locations/{location}/agent/sessions/{session}/contexts/{context}.
+   */
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static class ProjectLocationSessionContextBuilder {
+
+    private String project;
+    private String location;
+    private String session;
+    private String context;
+
+    private ProjectLocationSessionContextBuilder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getSession() {
+      return session;
+    }
+
+    public String getContext() {
+      return context;
+    }
+
+    public ProjectLocationSessionContextBuilder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public ProjectLocationSessionContextBuilder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public ProjectLocationSessionContextBuilder setSession(String session) {
+      this.session = session;
+      return this;
+    }
+
+    public ProjectLocationSessionContextBuilder setContext(String context) {
+      this.context = context;
+      return this;
+    }
+
+    public ContextName build() {
+      return new ContextName(this);
+    }
+  }
+
   @Override
   public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o instanceof ContextName) {
+    if (o != null || getClass() == o.getClass()) {
       ContextName that = (ContextName) o;
-      return (this.project.equals(that.project))
-          && (this.session.equals(that.session))
-          && (this.context.equals(that.context));
+      return (Objects.equals(this.project, that.project))
+          && (Objects.equals(this.session, that.session))
+          && (Objects.equals(this.context, that.context))
+          && (Objects.equals(this.environment, that.environment))
+          && (Objects.equals(this.user, that.user))
+          && (Objects.equals(this.location, that.location));
     }
     return false;
   }
@@ -200,11 +500,19 @@ public boolean equals(Object o) {
   public int hashCode() {
     int h = 1;
     h *= 1000003;
-    h ^= project.hashCode();
+    h ^= Objects.hashCode(fixedValue);
+    h *= 1000003;
+    h ^= Objects.hashCode(project);
+    h *= 1000003;
+    h ^= Objects.hashCode(session);
+    h *= 1000003;
+    h ^= Objects.hashCode(context);
+    h *= 1000003;
+    h ^= Objects.hashCode(environment);
     h *= 1000003;
-    h ^= session.hashCode();
+    h ^= Objects.hashCode(user);
     h *= 1000003;
-    h ^= context.hashCode();
+    h ^= Objects.hashCode(location);
     return h;
   }
 }
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextProto.java
index ce5575bbc..7cecfc75b 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextProto.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ContextProto.java
@@ -104,7 +104,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\372A#\n!dialogflow.googleapis.com/Context\"U"
           + "\n\030DeleteAllContextsRequest\0229\n\006parent\030\001 \001"
           + "(\tB)\340A\002\372A#\022!dialogflow.googleapis.com/Co"
-          + "ntext2\222\026\n\010Contexts\022\272\003\n\014ListContexts\0224.go"
+          + "ntext2\234\026\n\010Contexts\022\272\003\n\014ListContexts\0224.go"
           + "ogle.cloud.dialogflow.v2beta1.ListContex"
           + "tsRequest\0325.google.cloud.dialogflow.v2be"
           + "ta1.ListContextsResponse\"\274\002\202\323\344\223\002\254\002\0226/v2b"
@@ -138,10 +138,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\007contextZd\"Y/v2beta1/{parent=projects/*/"
           + "locations/*/agent/environments/*/users/*"
           + "/sessions/*}/contexts:\007context\332A\016parent,"
-          + "context\022\200\004\n\rUpdateContext\0225.google.cloud"
+          + "context\022\212\004\n\rUpdateContext\0225.google.cloud"
           + ".dialogflow.v2beta1.UpdateContextRequest"
           + "\032(.google.cloud.dialogflow.v2beta1.Conte"
-          + "xt\"\215\003\202\323\344\223\002\360\0022>/v2beta1/{context.name=pro"
+          + "xt\"\227\003\202\323\344\223\002\360\0022>/v2beta1/{context.name=pro"
           + "jects/*/agent/sessions/*/contexts/*}:\007co"
           + "ntextZ`2U/v2beta1/{context.name=projects"
           + "/*/agent/environments/*/users/*/sessions"
@@ -151,35 +151,35 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "a1/{context.name=projects/*/locations/*/"
           + "agent/environments/*/users/*/sessions/*/"
           + "contexts/*}:\007context\332A\023context,update_ma"
-          + "sk\022\233\003\n\rDeleteContext\0225.google.cloud.dial"
-          + "ogflow.v2beta1.DeleteContextRequest\032\026.go"
-          + "ogle.protobuf.Empty\"\272\002\202\323\344\223\002\254\002*6/v2beta1/"
-          + "{name=projects/*/agent/sessions/*/contex"
-          + "ts/*}ZO*M/v2beta1/{name=projects/*/agent"
-          + "/environments/*/users/*/sessions/*/conte"
-          + "xts/*}ZD*B/v2beta1/{name=projects/*/loca"
-          + "tions/*/agent/sessions/*/contexts/*}Z[*Y"
-          + "/v2beta1/{name=projects/*/locations/*/ag"
-          + "ent/environments/*/users/*/sessions/*/co"
-          + "ntexts/*}\332A\004name\022\245\003\n\021DeleteAllContexts\0229"
-          + ".google.cloud.dialogflow.v2beta1.DeleteA"
-          + "llContextsRequest\032\026.google.protobuf.Empt"
-          + "y\"\274\002\202\323\344\223\002\254\002*6/v2beta1/{parent=projects/*"
-          + "/agent/sessions/*}/contextsZO*M/v2beta1/"
-          + "{parent=projects/*/agent/environments/*/"
-          + "users/*/sessions/*}/contextsZD*B/v2beta1"
-          + "/{parent=projects/*/locations/*/agent/se"
-          + "ssions/*}/contextsZ[*Y/v2beta1/{parent=p"
-          + "rojects/*/locations/*/agent/environments"
-          + "/*/users/*/sessions/*}/contexts\332A\006parent"
-          + "\032x\312A\031dialogflow.googleapis.com\322AYhttps:/"
-          + "/www.googleapis.com/auth/cloud-platform,"
-          + "https://www.googleapis.com/auth/dialogfl"
-          + "owB\252\001\n#com.google.cloud.dialogflow.v2bet"
-          + "a1B\014ContextProtoP\001ZIgoogle.golang.org/ge"
-          + "nproto/googleapis/cloud/dialogflow/v2bet"
-          + "a1;dialogflow\370\001\001\242\002\002DF\252\002\037Google.Cloud.Dia"
-          + "logflow.V2beta1b\006proto3"
+          + "sk\332A\007context\022\233\003\n\rDeleteContext\0225.google."
+          + "cloud.dialogflow.v2beta1.DeleteContextRe"
+          + "quest\032\026.google.protobuf.Empty\"\272\002\202\323\344\223\002\254\002*"
+          + "6/v2beta1/{name=projects/*/agent/session"
+          + "s/*/contexts/*}ZO*M/v2beta1/{name=projec"
+          + "ts/*/agent/environments/*/users/*/sessio"
+          + "ns/*/contexts/*}ZD*B/v2beta1/{name=proje"
+          + "cts/*/locations/*/agent/sessions/*/conte"
+          + "xts/*}Z[*Y/v2beta1/{name=projects/*/loca"
+          + "tions/*/agent/environments/*/users/*/ses"
+          + "sions/*/contexts/*}\332A\004name\022\245\003\n\021DeleteAll"
+          + "Contexts\0229.google.cloud.dialogflow.v2bet"
+          + "a1.DeleteAllContextsRequest\032\026.google.pro"
+          + "tobuf.Empty\"\274\002\202\323\344\223\002\254\002*6/v2beta1/{parent="
+          + "projects/*/agent/sessions/*}/contextsZO*"
+          + "M/v2beta1/{parent=projects/*/agent/envir"
+          + "onments/*/users/*/sessions/*}/contextsZD"
+          + "*B/v2beta1/{parent=projects/*/locations/"
+          + "*/agent/sessions/*}/contextsZ[*Y/v2beta1"
+          + "/{parent=projects/*/locations/*/agent/en"
+          + "vironments/*/users/*/sessions/*}/context"
+          + "s\332A\006parent\032x\312A\031dialogflow.googleapis.com"
+          + "\322AYhttps://www.googleapis.com/auth/cloud"
+          + "-platform,https://www.googleapis.com/aut"
+          + "h/dialogflowB\252\001\n#com.google.cloud.dialog"
+          + "flow.v2beta1B\014ContextProtoP\001ZIgoogle.gol"
+          + "ang.org/genproto/googleapis/cloud/dialog"
+          + "flow/v2beta1;dialogflow\370\001\001\242\002\002DF\252\002\037Google"
+          + ".Cloud.Dialogflow.V2beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java
index 33a7e7612..156e9ef2c 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequest.java
@@ -207,7 +207,9 @@ public com.google.protobuf.ByteString getParentBytes() {
    * Required. The intent to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the intent field is set.
    */
@@ -222,7 +224,9 @@ public boolean hasIntent() {
    * Required. The intent to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The intent.
    */
@@ -239,7 +243,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent getIntent() {
    * Required. The intent to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder() {
@@ -853,7 +859,9 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * Required. The intent to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return Whether the intent field is set.
      */
@@ -867,7 +875,9 @@ public boolean hasIntent() {
      * Required. The intent to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return The intent.
      */
@@ -887,7 +897,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent getIntent() {
      * Required. The intent to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
       if (intentBuilder_ == null) {
@@ -909,7 +921,9 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
      * Required. The intent to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent.Builder builderForValue) {
       if (intentBuilder_ == null) {
@@ -928,7 +942,9 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent.Builder buil
      * Required. The intent to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder mergeIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
       if (intentBuilder_ == null) {
@@ -954,7 +970,9 @@ public Builder mergeIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
      * Required. The intent to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder clearIntent() {
       if (intentBuilder_ == null) {
@@ -974,7 +992,9 @@ public Builder clearIntent() {
      * Required. The intent to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Intent.Builder getIntentBuilder() {
 
@@ -988,7 +1008,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder getIntentBuilder() {
      * Required. The intent to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder() {
       if (intentBuilder_ != null) {
@@ -1006,7 +1028,9 @@ public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder()
      * Required. The intent to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Intent,
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequestOrBuilder.java
index d5b3c5561..93fba9ddd 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateIntentRequestOrBuilder.java
@@ -61,7 +61,9 @@ public interface CreateIntentRequestOrBuilder
    * Required. The intent to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the intent field is set.
    */
@@ -73,7 +75,9 @@ public interface CreateIntentRequestOrBuilder
    * Required. The intent to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The intent.
    */
@@ -85,7 +89,9 @@ public interface CreateIntentRequestOrBuilder
    * Required. The intent to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder();
 
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java
index acd2dda36..967112da3 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequest.java
@@ -201,7 +201,9 @@ public com.google.protobuf.ByteString getParentBytes() {
    * Required. The session entity type to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the sessionEntityType field is set.
    */
@@ -216,7 +218,9 @@ public boolean hasSessionEntityType() {
    * Required. The session entity type to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The sessionEntityType.
    */
@@ -233,7 +237,9 @@ public com.google.cloud.dialogflow.v2beta1.SessionEntityType getSessionEntityTyp
    * Required. The session entity type to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder
@@ -750,7 +756,9 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * Required. The session entity type to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return Whether the sessionEntityType field is set.
      */
@@ -764,7 +772,9 @@ public boolean hasSessionEntityType() {
      * Required. The session entity type to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return The sessionEntityType.
      */
@@ -784,7 +794,9 @@ public com.google.cloud.dialogflow.v2beta1.SessionEntityType getSessionEntityTyp
      * Required. The session entity type to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setSessionEntityType(
         com.google.cloud.dialogflow.v2beta1.SessionEntityType value) {
@@ -807,7 +819,9 @@ public Builder setSessionEntityType(
      * Required. The session entity type to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setSessionEntityType(
         com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder builderForValue) {
@@ -827,7 +841,9 @@ public Builder setSessionEntityType(
      * Required. The session entity type to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder mergeSessionEntityType(
         com.google.cloud.dialogflow.v2beta1.SessionEntityType value) {
@@ -854,7 +870,9 @@ public Builder mergeSessionEntityType(
      * Required. The session entity type to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder clearSessionEntityType() {
       if (sessionEntityTypeBuilder_ == null) {
@@ -874,7 +892,9 @@ public Builder clearSessionEntityType() {
      * Required. The session entity type to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder
         getSessionEntityTypeBuilder() {
@@ -889,7 +909,9 @@ public Builder clearSessionEntityType() {
      * Required. The session entity type to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder
         getSessionEntityTypeOrBuilder() {
@@ -908,7 +930,9 @@ public Builder clearSessionEntityType() {
      * Required. The session entity type to create.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.SessionEntityType,
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequestOrBuilder.java
index 3510a8bf7..6860f3f62 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/CreateSessionEntityTypeRequestOrBuilder.java
@@ -69,7 +69,9 @@ public interface CreateSessionEntityTypeRequestOrBuilder
    * Required. The session entity type to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the sessionEntityType field is set.
    */
@@ -81,7 +83,9 @@ public interface CreateSessionEntityTypeRequestOrBuilder
    * Required. The session entity type to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The sessionEntityType.
    */
@@ -93,7 +97,9 @@ public interface CreateSessionEntityTypeRequestOrBuilder
    * Required. The session entity type to create.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 2 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder getSessionEntityTypeOrBuilder();
 }
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java
index 62c00a956..93c737db1 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequest.java
@@ -201,7 +201,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
-   * <code>string session = 1 [(.google.api.resource_reference) = { ... }</code>
+   * <code>
+   * string session = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
    *
    * @return The session.
    */
@@ -234,7 +236,9 @@ public java.lang.String getSession() {
    * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
-   * <code>string session = 1 [(.google.api.resource_reference) = { ... }</code>
+   * <code>
+   * string session = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
    *
    * @return The bytes for session.
    */
@@ -312,7 +316,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryPara
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the queryInput field is set.
    */
@@ -331,7 +337,9 @@ public boolean hasQueryInput() {
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The queryInput.
    */
@@ -352,7 +360,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryInput getQueryInput() {
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBuilder() {
@@ -959,7 +969,9 @@ public Builder mergeFrom(
      * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
-     * <code>string session = 1 [(.google.api.resource_reference) = { ... }</code>
+     * <code>
+     * string session = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
      *
      * @return The session.
      */
@@ -991,7 +1003,9 @@ public java.lang.String getSession() {
      * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
-     * <code>string session = 1 [(.google.api.resource_reference) = { ... }</code>
+     * <code>
+     * string session = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
      *
      * @return The bytes for session.
      */
@@ -1023,7 +1037,9 @@ public com.google.protobuf.ByteString getSessionBytes() {
      * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
-     * <code>string session = 1 [(.google.api.resource_reference) = { ... }</code>
+     * <code>
+     * string session = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
      *
      * @param value The session to set.
      * @return This builder for chaining.
@@ -1054,7 +1070,9 @@ public Builder setSession(java.lang.String value) {
      * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
-     * <code>string session = 1 [(.google.api.resource_reference) = { ... }</code>
+     * <code>
+     * string session = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
      *
      * @return This builder for chaining.
      */
@@ -1081,7 +1099,9 @@ public Builder clearSession() {
      * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
-     * <code>string session = 1 [(.google.api.resource_reference) = { ... }</code>
+     * <code>
+     * string session = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
      *
      * @param value The bytes for session to set.
      * @return This builder for chaining.
@@ -1300,7 +1320,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryPara
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return Whether the queryInput field is set.
      */
@@ -1318,7 +1340,9 @@ public boolean hasQueryInput() {
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return The queryInput.
      */
@@ -1342,7 +1366,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryInput getQueryInput() {
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput value) {
       if (queryInputBuilder_ == null) {
@@ -1368,7 +1394,9 @@ public Builder setQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput valu
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setQueryInput(
         com.google.cloud.dialogflow.v2beta1.QueryInput.Builder builderForValue) {
@@ -1392,7 +1420,9 @@ public Builder setQueryInput(
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder mergeQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput value) {
       if (queryInputBuilder_ == null) {
@@ -1422,7 +1452,9 @@ public Builder mergeQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput va
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder clearQueryInput() {
       if (queryInputBuilder_ == null) {
@@ -1446,7 +1478,9 @@ public Builder clearQueryInput() {
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryInput.Builder getQueryInputBuilder() {
 
@@ -1464,7 +1498,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryInput.Builder getQueryInputBuild
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBuilder() {
       if (queryInputBuilder_ != null) {
@@ -1486,7 +1522,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBu
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.QueryInput,
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequestOrBuilder.java
index 2670195e4..a4fdeabb7 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DetectIntentRequestOrBuilder.java
@@ -40,7 +40,9 @@ public interface DetectIntentRequestOrBuilder
    * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
-   * <code>string session = 1 [(.google.api.resource_reference) = { ... }</code>
+   * <code>
+   * string session = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
    *
    * @return The session.
    */
@@ -62,7 +64,9 @@ public interface DetectIntentRequestOrBuilder
    * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
-   * <code>string session = 1 [(.google.api.resource_reference) = { ... }</code>
+   * <code>
+   * string session = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
    *
    * @return The bytes for session.
    */
@@ -114,7 +118,9 @@ public interface DetectIntentRequestOrBuilder
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the queryInput field is set.
    */
@@ -130,7 +136,9 @@ public interface DetectIntentRequestOrBuilder
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The queryInput.
    */
@@ -146,7 +154,9 @@ public interface DetectIntentRequestOrBuilder
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBuilder();
 
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentProto.java
index 194accd8f..e6950d377 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentProto.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/DocumentProto.java
@@ -67,6 +67,10 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_cloud_dialogflow_v2beta1_ReloadDocumentRequest_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_cloud_dialogflow_v2beta1_ReloadDocumentRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_cloud_dialogflow_v2beta1_AutoApproveSmartMessagingEntriesResponse_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_cloud_dialogflow_v2beta1_AutoApproveSmartMessagingEntriesResponse_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
@@ -128,59 +132,62 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "est\0228\n\004name\030\001 \001(\tB*\340A\002\372A$\n\"dialogflow.go"
           + "ogleapis.com/Document\022@\n\ngcs_source\030\003 \001("
           + "\0132*.google.cloud.dialogflow.v2beta1.GcsS"
-          + "ourceH\000B\010\n\006source2\362\016\n\tDocuments\022\212\002\n\rList"
-          + "Documents\0225.google.cloud.dialogflow.v2be"
-          + "ta1.ListDocumentsRequest\0326.google.cloud."
-          + "dialogflow.v2beta1.ListDocumentsResponse"
-          + "\"\211\001\202\323\344\223\002z\0227/v2beta1/{parent=projects/*/k"
-          + "nowledgeBases/*}/documentsZ?\022=/v2beta1/{"
-          + "parent=projects/*/agent/knowledgeBases/*"
-          + "}/documents\332A\006parent\022\367\001\n\013GetDocument\0223.g"
-          + "oogle.cloud.dialogflow.v2beta1.GetDocume"
-          + "ntRequest\032).google.cloud.dialogflow.v2be"
-          + "ta1.Document\"\207\001\202\323\344\223\002z\0227/v2beta1/{name=pr"
-          + "ojects/*/knowledgeBases/*/documents/*}Z?"
-          + "\022=/v2beta1/{name=projects/*/agent/knowle"
-          + "dgeBases/*/documents/*}\332A\004name\022\272\002\n\016Creat"
-          + "eDocument\0226.google.cloud.dialogflow.v2be"
-          + "ta1.CreateDocumentRequest\032\035.google.longr"
-          + "unning.Operation\"\320\001\202\323\344\223\002\216\001\"7/v2beta1/{pa"
-          + "rent=projects/*/knowledgeBases/*}/docume"
-          + "nts:\010documentZI\"=/v2beta1/{parent=projec"
-          + "ts/*/agent/knowledgeBases/*}/documents:\010"
-          + "document\332A\017parent,document\312A&\n\010Document\022"
-          + "\032KnowledgeOperationMetadata\022\247\002\n\016DeleteDo"
+          + "ourceH\000B\010\n\006source\"s\n(AutoApproveSmartMes"
+          + "sagingEntriesResponse\022\025\n\renabled_count\030\001"
+          + " \001(\005\022\026\n\016disabled_count\030\002 \001(\005\022\030\n\020unreview"
+          + "ed_count\030\003 \001(\0052\375\016\n\tDocuments\022\212\002\n\rListDoc"
+          + "uments\0225.google.cloud.dialogflow.v2beta1"
+          + ".ListDocumentsRequest\0326.google.cloud.dia"
+          + "logflow.v2beta1.ListDocumentsResponse\"\211\001"
+          + "\202\323\344\223\002z\0227/v2beta1/{parent=projects/*/know"
+          + "ledgeBases/*}/documentsZ?\022=/v2beta1/{par"
+          + "ent=projects/*/agent/knowledgeBases/*}/d"
+          + "ocuments\332A\006parent\022\367\001\n\013GetDocument\0223.goog"
+          + "le.cloud.dialogflow.v2beta1.GetDocumentR"
+          + "equest\032).google.cloud.dialogflow.v2beta1"
+          + ".Document\"\207\001\202\323\344\223\002z\0227/v2beta1/{name=proje"
+          + "cts/*/knowledgeBases/*/documents/*}Z?\022=/"
+          + "v2beta1/{name=projects/*/agent/knowledge"
+          + "Bases/*/documents/*}\332A\004name\022\272\002\n\016CreateDo"
           + "cument\0226.google.cloud.dialogflow.v2beta1"
-          + ".DeleteDocumentRequest\032\035.google.longrunn"
-          + "ing.Operation\"\275\001\202\323\344\223\002z*7/v2beta1/{name=p"
-          + "rojects/*/knowledgeBases/*/documents/*}Z"
-          + "?*=/v2beta1/{name=projects/*/agent/knowl"
-          + "edgeBases/*/documents/*}\332A\004name\312A3\n\025goog"
-          + "le.protobuf.Empty\022\032KnowledgeOperationMet"
-          + "adata\022\321\002\n\016UpdateDocument\0226.google.cloud."
-          + "dialogflow.v2beta1.UpdateDocumentRequest"
-          + "\032\035.google.longrunning.Operation\"\347\001\202\323\344\223\002\240"
-          + "\0012@/v2beta1/{document.name=projects/*/kn"
-          + "owledgeBases/*/documents/*}:\010documentZR2"
-          + "F/v2beta1/{document.name=projects/*/agen"
-          + "t/knowledgeBases/*/documents/*}:\010documen"
-          + "t\332A\024document,update_mask\312A&\n\010Document\022\032K"
-          + "nowledgeOperationMetadata\022\250\002\n\016ReloadDocu"
-          + "ment\0226.google.cloud.dialogflow.v2beta1.R"
-          + "eloadDocumentRequest\032\035.google.longrunnin"
-          + "g.Operation\"\276\001\202\323\344\223\002\216\001\">/v2beta1/{name=pr"
-          + "ojects/*/knowledgeBases/*/documents/*}:r"
-          + "eload:\001*ZI\"D/v2beta1/{name=projects/*/ag"
-          + "ent/knowledgeBases/*/documents/*}:reload"
-          + ":\001*\312A&\n\010Document\022\032KnowledgeOperationMeta"
-          + "data\032x\312A\031dialogflow.googleapis.com\322AYhtt"
-          + "ps://www.googleapis.com/auth/cloud-platf"
-          + "orm,https://www.googleapis.com/auth/dial"
-          + "ogflowB\253\001\n#com.google.cloud.dialogflow.v"
-          + "2beta1B\rDocumentProtoP\001ZIgoogle.golang.o"
-          + "rg/genproto/googleapis/cloud/dialogflow/"
-          + "v2beta1;dialogflow\370\001\001\242\002\002DF\252\002\037Google.Clou"
-          + "d.Dialogflow.V2beta1b\006proto3"
+          + ".CreateDocumentRequest\032\035.google.longrunn"
+          + "ing.Operation\"\320\001\202\323\344\223\002\216\001\"7/v2beta1/{paren"
+          + "t=projects/*/knowledgeBases/*}/documents"
+          + ":\010documentZI\"=/v2beta1/{parent=projects/"
+          + "*/agent/knowledgeBases/*}/documents:\010doc"
+          + "ument\332A\017parent,document\312A&\n\010Document\022\032Kn"
+          + "owledgeOperationMetadata\022\247\002\n\016DeleteDocum"
+          + "ent\0226.google.cloud.dialogflow.v2beta1.De"
+          + "leteDocumentRequest\032\035.google.longrunning"
+          + ".Operation\"\275\001\202\323\344\223\002z*7/v2beta1/{name=proj"
+          + "ects/*/knowledgeBases/*/documents/*}Z?*="
+          + "/v2beta1/{name=projects/*/agent/knowledg"
+          + "eBases/*/documents/*}\332A\004name\312A3\n\025google."
+          + "protobuf.Empty\022\032KnowledgeOperationMetada"
+          + "ta\022\334\002\n\016UpdateDocument\0226.google.cloud.dia"
+          + "logflow.v2beta1.UpdateDocumentRequest\032\035."
+          + "google.longrunning.Operation\"\362\001\202\323\344\223\002\240\0012@"
+          + "/v2beta1/{document.name=projects/*/knowl"
+          + "edgeBases/*/documents/*}:\010documentZR2F/v"
+          + "2beta1/{document.name=projects/*/agent/k"
+          + "nowledgeBases/*/documents/*}:\010document\332A"
+          + "\024document,update_mask\332A\010document\312A&\n\010Doc"
+          + "ument\022\032KnowledgeOperationMetadata\022\250\002\n\016Re"
+          + "loadDocument\0226.google.cloud.dialogflow.v"
+          + "2beta1.ReloadDocumentRequest\032\035.google.lo"
+          + "ngrunning.Operation\"\276\001\202\323\344\223\002\216\001\">/v2beta1/"
+          + "{name=projects/*/knowledgeBases/*/docume"
+          + "nts/*}:reload:\001*ZI\"D/v2beta1/{name=proje"
+          + "cts/*/agent/knowledgeBases/*/documents/*"
+          + "}:reload:\001*\312A&\n\010Document\022\032KnowledgeOpera"
+          + "tionMetadata\032x\312A\031dialogflow.googleapis.c"
+          + "om\322AYhttps://www.googleapis.com/auth/clo"
+          + "ud-platform,https://www.googleapis.com/a"
+          + "uth/dialogflowB\253\001\n#com.google.cloud.dial"
+          + "ogflow.v2beta1B\rDocumentProtoP\001ZIgoogle."
+          + "golang.org/genproto/googleapis/cloud/dia"
+          + "logflow/v2beta1;dialogflow\370\001\001\242\002\002DF\252\002\037Goo"
+          + "gle.Cloud.Dialogflow.V2beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -286,6 +293,14 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "Name", "GcsSource", "Source",
             });
+    internal_static_google_cloud_dialogflow_v2beta1_AutoApproveSmartMessagingEntriesResponse_descriptor =
+        getDescriptor().getMessageTypes().get(9);
+    internal_static_google_cloud_dialogflow_v2beta1_AutoApproveSmartMessagingEntriesResponse_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_cloud_dialogflow_v2beta1_AutoApproveSmartMessagingEntriesResponse_descriptor,
+            new java.lang.String[] {
+              "EnabledCount", "DisabledCount", "UnreviewedCount",
+            });
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
     registry.add(com.google.api.ClientProto.defaultHost);
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeName.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeName.java
index 1f38b0729..3d878658a 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeName.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeName.java
@@ -16,25 +16,37 @@
 
 package com.google.cloud.dialogflow.v2beta1;
 
+import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /** AUTO-GENERATED DOCUMENTATION AND CLASS */
 @javax.annotation.Generated("by GAPIC protoc plugin")
 public class EntityTypeName implements ResourceName {
 
-  private static final PathTemplate PATH_TEMPLATE =
+  @Deprecated
+  protected EntityTypeName() {}
+
+  private static final PathTemplate PROJECT_ENTITY_TYPE_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}/agent/entityTypes/{entity_type}");
+  private static final PathTemplate PROJECT_LOCATION_ENTITY_TYPE_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/locations/{location}/agent/entityTypes/{entity_type}");
 
   private volatile Map<String, String> fieldValuesMap;
+  private PathTemplate pathTemplate;
+  private String fixedValue;
 
-  private final String project;
-  private final String entityType;
+  private String project;
+  private String entityType;
+  private String location;
 
   public String getProject() {
     return project;
@@ -44,35 +56,94 @@ public String getEntityType() {
     return entityType;
   }
 
+  public String getLocation() {
+    return location;
+  }
+
+  private EntityTypeName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    entityType = Preconditions.checkNotNull(builder.getEntityType());
+    pathTemplate = PROJECT_ENTITY_TYPE_PATH_TEMPLATE;
+  }
+
+  private EntityTypeName(ProjectLocationEntityTypeBuilder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    entityType = Preconditions.checkNotNull(builder.getEntityType());
+    pathTemplate = PROJECT_LOCATION_ENTITY_TYPE_PATH_TEMPLATE;
+  }
+
   public static Builder newBuilder() {
     return new Builder();
   }
 
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static Builder newProjectEntityTypeBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static ProjectLocationEntityTypeBuilder newProjectLocationEntityTypeBuilder() {
+    return new ProjectLocationEntityTypeBuilder();
+  }
+
   public Builder toBuilder() {
     return new Builder(this);
   }
 
-  private EntityTypeName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    entityType = Preconditions.checkNotNull(builder.getEntityType());
+  public static EntityTypeName of(String project, String entityType) {
+    return newProjectEntityTypeBuilder().setProject(project).setEntityType(entityType).build();
   }
 
-  public static EntityTypeName of(String project, String entityType) {
-    return newBuilder().setProject(project).setEntityType(entityType).build();
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static EntityTypeName ofProjectEntityTypeName(String project, String entityType) {
+    return newProjectEntityTypeBuilder().setProject(project).setEntityType(entityType).build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static EntityTypeName ofProjectLocationEntityTypeName(
+      String project, String location, String entityType) {
+    return newProjectLocationEntityTypeBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setEntityType(entityType)
+        .build();
   }
 
   public static String format(String project, String entityType) {
     return newBuilder().setProject(project).setEntityType(entityType).build().toString();
   }
 
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectEntityTypeName(String project, String entityType) {
+    return newBuilder().setProject(project).setEntityType(entityType).build().toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectLocationEntityTypeName(
+      String project, String location, String entityType) {
+    return newProjectLocationEntityTypeBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setEntityType(entityType)
+        .build()
+        .toString();
+  }
+
   public static EntityTypeName parse(String formattedString) {
     if (formattedString.isEmpty()) {
       return null;
     }
-    Map<String, String> matchMap =
-        PATH_TEMPLATE.validatedMatch(
-            formattedString, "EntityTypeName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("entity_type"));
+    if (PROJECT_ENTITY_TYPE_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap = PROJECT_ENTITY_TYPE_PATH_TEMPLATE.match(formattedString);
+      return ofProjectEntityTypeName(matchMap.get("project"), matchMap.get("entity_type"));
+    } else if (PROJECT_LOCATION_ENTITY_TYPE_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap =
+          PROJECT_LOCATION_ENTITY_TYPE_PATH_TEMPLATE.match(formattedString);
+      return ofProjectLocationEntityTypeName(
+          matchMap.get("project"), matchMap.get("location"), matchMap.get("entity_type"));
+    }
+    throw new ValidationException("JobName.parse: formattedString not in valid format");
   }
 
   public static List<EntityTypeName> parseList(List<String> formattedStrings) {
@@ -84,7 +155,7 @@ public static List<EntityTypeName> parseList(List<String> formattedStrings) {
   }
 
   public static List<String> toStringList(List<EntityTypeName> values) {
-    List<String> list = new ArrayList<String>(values.size());
+    List<String> list = new ArrayList<>(values.size());
     for (EntityTypeName value : values) {
       if (value == null) {
         list.add("");
@@ -96,16 +167,25 @@ public static List<String> toStringList(List<EntityTypeName> values) {
   }
 
   public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
+    return PROJECT_ENTITY_TYPE_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_LOCATION_ENTITY_TYPE_PATH_TEMPLATE.matches(formattedString);
   }
 
+  @Override
   public Map<String, String> getFieldValuesMap() {
     if (fieldValuesMap == null) {
       synchronized (this) {
         if (fieldValuesMap == null) {
           ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("project", project);
-          fieldMapBuilder.put("entityType", entityType);
+          if (project != null) {
+            fieldMapBuilder.put("project", project);
+          }
+          if (entityType != null) {
+            fieldMapBuilder.put("entity_type", entityType);
+          }
+          if (location != null) {
+            fieldMapBuilder.put("location", location);
+          }
           fieldValuesMap = fieldMapBuilder.build();
         }
       }
@@ -119,15 +199,17 @@ public String getFieldValue(String fieldName) {
 
   @Override
   public String toString() {
-    return PATH_TEMPLATE.instantiate("project", project, "entity_type", entityType);
+    return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
   }
 
-  /** Builder for EntityTypeName. */
+  /** Builder for projects/{project}/agent/entityTypes/{entity_type}. */
   public static class Builder {
 
     private String project;
     private String entityType;
 
+    protected Builder() {}
+
     public String getProject() {
       return project;
     }
@@ -146,9 +228,11 @@ public Builder setEntityType(String entityType) {
       return this;
     }
 
-    private Builder() {}
-
     private Builder(EntityTypeName entityTypeName) {
+      Preconditions.checkArgument(
+          entityTypeName.pathTemplate == PROJECT_ENTITY_TYPE_PATH_TEMPLATE,
+          "toBuilder is only supported when EntityTypeName has the pattern of "
+              + "projects/{project}/agent/entityTypes/{entity_type}.");
       project = entityTypeName.project;
       entityType = entityTypeName.entityType;
     }
@@ -158,14 +242,58 @@ public EntityTypeName build() {
     }
   }
 
+  /** Builder for projects/{project}/locations/{location}/agent/entityTypes/{entity_type}. */
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static class ProjectLocationEntityTypeBuilder {
+
+    private String project;
+    private String location;
+    private String entityType;
+
+    private ProjectLocationEntityTypeBuilder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getEntityType() {
+      return entityType;
+    }
+
+    public ProjectLocationEntityTypeBuilder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public ProjectLocationEntityTypeBuilder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public ProjectLocationEntityTypeBuilder setEntityType(String entityType) {
+      this.entityType = entityType;
+      return this;
+    }
+
+    public EntityTypeName build() {
+      return new EntityTypeName(this);
+    }
+  }
+
   @Override
   public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o instanceof EntityTypeName) {
+    if (o != null || getClass() == o.getClass()) {
       EntityTypeName that = (EntityTypeName) o;
-      return (this.project.equals(that.project)) && (this.entityType.equals(that.entityType));
+      return (Objects.equals(this.project, that.project))
+          && (Objects.equals(this.entityType, that.entityType))
+          && (Objects.equals(this.location, that.location));
     }
     return false;
   }
@@ -174,9 +302,13 @@ public boolean equals(Object o) {
   public int hashCode() {
     int h = 1;
     h *= 1000003;
-    h ^= project.hashCode();
+    h ^= Objects.hashCode(fixedValue);
+    h *= 1000003;
+    h ^= Objects.hashCode(project);
+    h *= 1000003;
+    h ^= Objects.hashCode(entityType);
     h *= 1000003;
-    h ^= entityType.hashCode();
+    h ^= Objects.hashCode(location);
     return h;
   }
 }
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeProto.java
index a90f09e29..d2f4a394a 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeProto.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeProto.java
@@ -156,114 +156,116 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ityType\"}\n\035BatchDeleteEntityTypesRequest"
           + "\022<\n\006parent\030\001 \001(\tB,\340A\002\372A&\022$dialogflow.goo"
           + "gleapis.com/EntityType\022\036\n\021entity_type_na"
-          + "mes\030\002 \003(\tB\003\340A\002\"\274\001\n\032BatchCreateEntitiesRe"
+          + "mes\030\002 \003(\tB\003\340A\002\"\301\001\n\032BatchCreateEntitiesRe"
           + "quest\022<\n\006parent\030\001 \001(\tB,\340A\002\372A&\n$dialogflo"
-          + "w.googleapis.com/EntityType\022D\n\010entities\030"
+          + "w.googleapis.com/EntityType\022I\n\010entities\030"
           + "\002 \003(\01322.google.cloud.dialogflow.v2beta1."
-          + "EntityType.Entity\022\032\n\rlanguage_code\030\003 \001(\t"
-          + "B\003\340A\001\"\355\001\n\032BatchUpdateEntitiesRequest\022<\n\006"
-          + "parent\030\001 \001(\tB,\340A\002\372A&\n$dialogflow.googlea"
-          + "pis.com/EntityType\022D\n\010entities\030\002 \003(\01322.g"
-          + "oogle.cloud.dialogflow.v2beta1.EntityTyp"
-          + "e.Entity\022\032\n\rlanguage_code\030\003 \001(\tB\003\340A\001\022/\n\013"
-          + "update_mask\030\004 \001(\0132\032.google.protobuf.Fiel"
-          + "dMask\"\215\001\n\032BatchDeleteEntitiesRequest\022<\n\006"
-          + "parent\030\001 \001(\tB,\340A\002\372A&\n$dialogflow.googlea"
-          + "pis.com/EntityType\022\025\n\rentity_values\030\002 \003("
-          + "\t\022\032\n\rlanguage_code\030\003 \001(\tB\003\340A\001\"T\n\017EntityT"
-          + "ypeBatch\022A\n\014entity_types\030\001 \003(\0132+.google."
-          + "cloud.dialogflow.v2beta1.EntityType2\374\032\n\013"
-          + "EntityTypes\022\233\002\n\017ListEntityTypes\0227.google"
-          + ".cloud.dialogflow.v2beta1.ListEntityType"
-          + "sRequest\0328.google.cloud.dialogflow.v2bet"
-          + "a1.ListEntityTypesResponse\"\224\001\202\323\344\223\002n\022./v2"
-          + "beta1/{parent=projects/*/agent}/entityTy"
-          + "pesZ<\022:/v2beta1/{parent=projects/*/locat"
-          + "ions/*/agent}/entityTypes\332A\006parent\332A\024par"
-          + "ent,language_code\022\206\002\n\rGetEntityType\0225.go"
-          + "ogle.cloud.dialogflow.v2beta1.GetEntityT"
-          + "ypeRequest\032+.google.cloud.dialogflow.v2b"
-          + "eta1.EntityType\"\220\001\202\323\344\223\002n\022./v2beta1/{name"
-          + "=projects/*/agent/entityTypes/*}Z<\022:/v2b"
-          + "eta1/{name=projects/*/locations/*/agent/"
-          + "entityTypes/*}\332A\004name\332A\022name,language_co"
-          + "de\022\303\002\n\020CreateEntityType\0228.google.cloud.d"
-          + "ialogflow.v2beta1.CreateEntityTypeReques"
-          + "t\032+.google.cloud.dialogflow.v2beta1.Enti"
-          + "tyType\"\307\001\202\323\344\223\002\210\001\"./v2beta1/{parent=proje"
-          + "cts/*/agent}/entityTypes:\013entity_typeZI\""
-          + ":/v2beta1/{parent=projects/*/locations/*"
-          + "/agent}/entityTypes:\013entity_type\332A\022paren"
-          + "t,entity_type\332A parent,entity_type,langu"
-          + "age_code\022\365\002\n\020UpdateEntityType\0228.google.c"
-          + "loud.dialogflow.v2beta1.UpdateEntityType"
-          + "Request\032+.google.cloud.dialogflow.v2beta"
-          + "1.EntityType\"\371\001\202\323\344\223\002\240\0012:/v2beta1/{entity"
-          + "_type.name=projects/*/agent/entityTypes/"
-          + "*}:\013entity_typeZU2F/v2beta1/{entity_type"
-          + ".name=projects/*/locations/*/agent/entit"
-          + "yTypes/*}:\013entity_type\332A\013entity_type\332A\031e"
-          + "ntity_type,language_code\332A%entity_type,l"
-          + "anguage_code,update_mask\022\341\001\n\020DeleteEntit"
-          + "yType\0228.google.cloud.dialogflow.v2beta1."
-          + "DeleteEntityTypeRequest\032\026.google.protobu"
-          + "f.Empty\"{\202\323\344\223\002n*./v2beta1/{name=projects"
-          + "/*/agent/entityTypes/*}Z<*:/v2beta1/{nam"
-          + "e=projects/*/locations/*/agent/entityTyp"
-          + "es/*}\332A\004name\022\350\002\n\026BatchUpdateEntityTypes\022"
-          + ">.google.cloud.dialogflow.v2beta1.BatchU"
-          + "pdateEntityTypesRequest\032\035.google.longrun"
-          + "ning.Operation\"\356\001\202\323\344\223\002\214\001\":/v2beta1/{pare"
-          + "nt=projects/*/agent}/entityTypes:batchUp"
-          + "date:\001*ZK\"F/v2beta1/{parent=projects/*/l"
-          + "ocations/*/agent}/entityTypes:batchUpdat"
-          + "e:\001*\312AX\n>google.cloud.dialogflow.v2beta1"
-          + ".BatchUpdateEntityTypesResponse\022\026google."
-          + "protobuf.Struct\022\332\002\n\026BatchDeleteEntityTyp"
-          + "es\022>.google.cloud.dialogflow.v2beta1.Bat"
-          + "chDeleteEntityTypesRequest\032\035.google.long"
-          + "running.Operation\"\340\001\202\323\344\223\002\214\001\":/v2beta1/{p"
-          + "arent=projects/*/agent}/entityTypes:batc"
-          + "hDelete:\001*ZK\"F/v2beta1/{parent=projects/"
-          + "*/locations/*/agent}/entityTypes:batchDe"
-          + "lete:\001*\332A\030parent,entity_type_names\312A/\n\025g"
-          + "oogle.protobuf.Empty\022\026google.protobuf.St"
-          + "ruct\022\317\002\n\023BatchCreateEntities\022;.google.cl"
-          + "oud.dialogflow.v2beta1.BatchCreateEntiti"
-          + "esRequest\032\035.google.longrunning.Operation"
-          + "\"\333\001\202\323\344\223\002\242\001\"E/v2beta1/{parent=projects/*/"
-          + "agent/entityTypes/*}/entities:batchCreat"
-          + "e:\001*ZV\"Q/v2beta1/{parent=projects/*/loca"
-          + "tions/*/agent/entityTypes/*}/entities:ba"
-          + "tchCreate:\001*\312A/\n\025google.protobuf.Empty\022\026"
-          + "google.protobuf.Struct\022\201\003\n\023BatchUpdateEn"
-          + "tities\022;.google.cloud.dialogflow.v2beta1"
-          + ".BatchUpdateEntitiesRequest\032\035.google.lon"
-          + "grunning.Operation\"\215\002\202\323\344\223\002\242\001\"E/v2beta1/{"
-          + "parent=projects/*/agent/entityTypes/*}/e"
-          + "ntities:batchUpdate:\001*ZV\"Q/v2beta1/{pare"
-          + "nt=projects/*/locations/*/agent/entityTy"
-          + "pes/*}/entities:batchUpdate:\001*\332A\017parent,"
-          + "entities\332A\035parent,entities,language_code"
-          + "\312A/\n\025google.protobuf.Empty\022\026google.proto"
-          + "buf.Struct\022\213\003\n\023BatchDeleteEntities\022;.goo"
-          + "gle.cloud.dialogflow.v2beta1.BatchDelete"
-          + "EntitiesRequest\032\035.google.longrunning.Ope"
-          + "ration\"\227\002\202\323\344\223\002\242\001\"E/v2beta1/{parent=proje"
-          + "cts/*/agent/entityTypes/*}/entities:batc"
-          + "hDelete:\001*ZV\"Q/v2beta1/{parent=projects/"
-          + "*/locations/*/agent/entityTypes/*}/entit"
-          + "ies:batchDelete:\001*\332A\024parent,entity_value"
-          + "s\332A\"parent,entity_values,language_code\312A"
-          + "/\n\025google.protobuf.Empty\022\026google.protobu"
-          + "f.Struct\032x\312A\031dialogflow.googleapis.com\322A"
-          + "Yhttps://www.googleapis.com/auth/cloud-p"
-          + "latform,https://www.googleapis.com/auth/"
-          + "dialogflowB\255\001\n#com.google.cloud.dialogfl"
-          + "ow.v2beta1B\017EntityTypeProtoP\001ZIgoogle.go"
-          + "lang.org/genproto/googleapis/cloud/dialo"
-          + "gflow/v2beta1;dialogflow\370\001\001\242\002\002DF\252\002\037Googl"
-          + "e.Cloud.Dialogflow.V2beta1b\006proto3"
+          + "EntityType.EntityB\003\340A\002\022\032\n\rlanguage_code\030"
+          + "\003 \001(\tB\003\340A\001\"\362\001\n\032BatchUpdateEntitiesReques"
+          + "t\022<\n\006parent\030\001 \001(\tB,\340A\002\372A&\n$dialogflow.go"
+          + "ogleapis.com/EntityType\022I\n\010entities\030\002 \003("
+          + "\01322.google.cloud.dialogflow.v2beta1.Enti"
+          + "tyType.EntityB\003\340A\002\022\032\n\rlanguage_code\030\003 \001("
+          + "\tB\003\340A\001\022/\n\013update_mask\030\004 \001(\0132\032.google.pro"
+          + "tobuf.FieldMask\"\222\001\n\032BatchDeleteEntitiesR"
+          + "equest\022<\n\006parent\030\001 \001(\tB,\340A\002\372A&\n$dialogfl"
+          + "ow.googleapis.com/EntityType\022\032\n\rentity_v"
+          + "alues\030\002 \003(\tB\003\340A\002\022\032\n\rlanguage_code\030\003 \001(\tB"
+          + "\003\340A\001\"T\n\017EntityTypeBatch\022A\n\014entity_types\030"
+          + "\001 \003(\0132+.google.cloud.dialogflow.v2beta1."
+          + "EntityType2\256\033\n\013EntityTypes\022\233\002\n\017ListEntit"
+          + "yTypes\0227.google.cloud.dialogflow.v2beta1"
+          + ".ListEntityTypesRequest\0328.google.cloud.d"
+          + "ialogflow.v2beta1.ListEntityTypesRespons"
+          + "e\"\224\001\202\323\344\223\002n\022./v2beta1/{parent=projects/*/"
+          + "agent}/entityTypesZ<\022:/v2beta1/{parent=p"
+          + "rojects/*/locations/*/agent}/entityTypes"
+          + "\332A\006parent\332A\024parent,language_code\022\206\002\n\rGet"
+          + "EntityType\0225.google.cloud.dialogflow.v2b"
+          + "eta1.GetEntityTypeRequest\032+.google.cloud"
+          + ".dialogflow.v2beta1.EntityType\"\220\001\202\323\344\223\002n\022"
+          + "./v2beta1/{name=projects/*/agent/entityT"
+          + "ypes/*}Z<\022:/v2beta1/{name=projects/*/loc"
+          + "ations/*/agent/entityTypes/*}\332A\004name\332A\022n"
+          + "ame,language_code\022\303\002\n\020CreateEntityType\0228"
+          + ".google.cloud.dialogflow.v2beta1.CreateE"
+          + "ntityTypeRequest\032+.google.cloud.dialogfl"
+          + "ow.v2beta1.EntityType\"\307\001\202\323\344\223\002\210\001\"./v2beta"
+          + "1/{parent=projects/*/agent}/entityTypes:"
+          + "\013entity_typeZI\":/v2beta1/{parent=project"
+          + "s/*/locations/*/agent}/entityTypes:\013enti"
+          + "ty_type\332A\022parent,entity_type\332A parent,en"
+          + "tity_type,language_code\022\365\002\n\020UpdateEntity"
+          + "Type\0228.google.cloud.dialogflow.v2beta1.U"
+          + "pdateEntityTypeRequest\032+.google.cloud.di"
+          + "alogflow.v2beta1.EntityType\"\371\001\202\323\344\223\002\240\0012:/"
+          + "v2beta1/{entity_type.name=projects/*/age"
+          + "nt/entityTypes/*}:\013entity_typeZU2F/v2bet"
+          + "a1/{entity_type.name=projects/*/location"
+          + "s/*/agent/entityTypes/*}:\013entity_type\332A\013"
+          + "entity_type\332A\031entity_type,language_code\332"
+          + "A%entity_type,language_code,update_mask\022"
+          + "\341\001\n\020DeleteEntityType\0228.google.cloud.dial"
+          + "ogflow.v2beta1.DeleteEntityTypeRequest\032\026"
+          + ".google.protobuf.Empty\"{\202\323\344\223\002n*./v2beta1"
+          + "/{name=projects/*/agent/entityTypes/*}Z<"
+          + "*:/v2beta1/{name=projects/*/locations/*/"
+          + "agent/entityTypes/*}\332A\004name\022\350\002\n\026BatchUpd"
+          + "ateEntityTypes\022>.google.cloud.dialogflow"
+          + ".v2beta1.BatchUpdateEntityTypesRequest\032\035"
+          + ".google.longrunning.Operation\"\356\001\202\323\344\223\002\214\001\""
+          + ":/v2beta1/{parent=projects/*/agent}/enti"
+          + "tyTypes:batchUpdate:\001*ZK\"F/v2beta1/{pare"
+          + "nt=projects/*/locations/*/agent}/entityT"
+          + "ypes:batchUpdate:\001*\312AX\n>google.cloud.dia"
+          + "logflow.v2beta1.BatchUpdateEntityTypesRe"
+          + "sponse\022\026google.protobuf.Struct\022\332\002\n\026Batch"
+          + "DeleteEntityTypes\022>.google.cloud.dialogf"
+          + "low.v2beta1.BatchDeleteEntityTypesReques"
+          + "t\032\035.google.longrunning.Operation\"\340\001\202\323\344\223\002"
+          + "\214\001\":/v2beta1/{parent=projects/*/agent}/e"
+          + "ntityTypes:batchDelete:\001*ZK\"F/v2beta1/{p"
+          + "arent=projects/*/locations/*/agent}/enti"
+          + "tyTypes:batchDelete:\001*\332A\030parent,entity_t"
+          + "ype_names\312A/\n\025google.protobuf.Empty\022\026goo"
+          + "gle.protobuf.Struct\022\201\003\n\023BatchCreateEntit"
+          + "ies\022;.google.cloud.dialogflow.v2beta1.Ba"
+          + "tchCreateEntitiesRequest\032\035.google.longru"
+          + "nning.Operation\"\215\002\202\323\344\223\002\242\001\"E/v2beta1/{par"
+          + "ent=projects/*/agent/entityTypes/*}/enti"
+          + "ties:batchCreate:\001*ZV\"Q/v2beta1/{parent="
+          + "projects/*/locations/*/agent/entityTypes"
+          + "/*}/entities:batchCreate:\001*\332A\017parent,ent"
+          + "ities\332A\035parent,entities,language_code\312A/"
+          + "\n\025google.protobuf.Empty\022\026google.protobuf"
+          + ".Struct\022\201\003\n\023BatchUpdateEntities\022;.google"
+          + ".cloud.dialogflow.v2beta1.BatchUpdateEnt"
+          + "itiesRequest\032\035.google.longrunning.Operat"
+          + "ion\"\215\002\202\323\344\223\002\242\001\"E/v2beta1/{parent=projects"
+          + "/*/agent/entityTypes/*}/entities:batchUp"
+          + "date:\001*ZV\"Q/v2beta1/{parent=projects/*/l"
+          + "ocations/*/agent/entityTypes/*}/entities"
+          + ":batchUpdate:\001*\332A\017parent,entities\332A\035pare"
+          + "nt,entities,language_code\312A/\n\025google.pro"
+          + "tobuf.Empty\022\026google.protobuf.Struct\022\213\003\n\023"
+          + "BatchDeleteEntities\022;.google.cloud.dialo"
+          + "gflow.v2beta1.BatchDeleteEntitiesRequest"
+          + "\032\035.google.longrunning.Operation\"\227\002\202\323\344\223\002\242"
+          + "\001\"E/v2beta1/{parent=projects/*/agent/ent"
+          + "ityTypes/*}/entities:batchDelete:\001*ZV\"Q/"
+          + "v2beta1/{parent=projects/*/locations/*/a"
+          + "gent/entityTypes/*}/entities:batchDelete"
+          + ":\001*\332A\024parent,entity_values\332A\"parent,enti"
+          + "ty_values,language_code\312A/\n\025google.proto"
+          + "buf.Empty\022\026google.protobuf.Struct\032x\312A\031di"
+          + "alogflow.googleapis.com\322AYhttps://www.go"
+          + "ogleapis.com/auth/cloud-platform,https:/"
+          + "/www.googleapis.com/auth/dialogflowB\255\001\n#"
+          + "com.google.cloud.dialogflow.v2beta1B\017Ent"
+          + "ityTypeProtoP\001ZIgoogle.golang.org/genpro"
+          + "to/googleapis/cloud/dialogflow/v2beta1;d"
+          + "ialogflow\370\001\001\242\002\002DF\252\002\037Google.Cloud.Dialogf"
+          + "low.V2beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentName.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentName.java
index 28b40a1d2..2a66da7c6 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentName.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentName.java
@@ -16,25 +16,37 @@
 
 package com.google.cloud.dialogflow.v2beta1;
 
+import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /** AUTO-GENERATED DOCUMENTATION AND CLASS */
 @javax.annotation.Generated("by GAPIC protoc plugin")
 public class EnvironmentName implements ResourceName {
 
-  private static final PathTemplate PATH_TEMPLATE =
+  @Deprecated
+  protected EnvironmentName() {}
+
+  private static final PathTemplate PROJECT_ENVIRONMENT_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}/agent/environments/{environment}");
+  private static final PathTemplate PROJECT_LOCATION_ENVIRONMENT_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/locations/{location}/agent/environments/{environment}");
 
   private volatile Map<String, String> fieldValuesMap;
+  private PathTemplate pathTemplate;
+  private String fixedValue;
 
-  private final String project;
-  private final String environment;
+  private String project;
+  private String environment;
+  private String location;
 
   public String getProject() {
     return project;
@@ -44,35 +56,94 @@ public String getEnvironment() {
     return environment;
   }
 
+  public String getLocation() {
+    return location;
+  }
+
+  private EnvironmentName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    environment = Preconditions.checkNotNull(builder.getEnvironment());
+    pathTemplate = PROJECT_ENVIRONMENT_PATH_TEMPLATE;
+  }
+
+  private EnvironmentName(ProjectLocationEnvironmentBuilder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    environment = Preconditions.checkNotNull(builder.getEnvironment());
+    pathTemplate = PROJECT_LOCATION_ENVIRONMENT_PATH_TEMPLATE;
+  }
+
   public static Builder newBuilder() {
     return new Builder();
   }
 
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static Builder newProjectEnvironmentBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static ProjectLocationEnvironmentBuilder newProjectLocationEnvironmentBuilder() {
+    return new ProjectLocationEnvironmentBuilder();
+  }
+
   public Builder toBuilder() {
     return new Builder(this);
   }
 
-  private EnvironmentName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    environment = Preconditions.checkNotNull(builder.getEnvironment());
+  public static EnvironmentName of(String project, String environment) {
+    return newProjectEnvironmentBuilder().setProject(project).setEnvironment(environment).build();
   }
 
-  public static EnvironmentName of(String project, String environment) {
-    return newBuilder().setProject(project).setEnvironment(environment).build();
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static EnvironmentName ofProjectEnvironmentName(String project, String environment) {
+    return newProjectEnvironmentBuilder().setProject(project).setEnvironment(environment).build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static EnvironmentName ofProjectLocationEnvironmentName(
+      String project, String location, String environment) {
+    return newProjectLocationEnvironmentBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setEnvironment(environment)
+        .build();
   }
 
   public static String format(String project, String environment) {
     return newBuilder().setProject(project).setEnvironment(environment).build().toString();
   }
 
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectEnvironmentName(String project, String environment) {
+    return newBuilder().setProject(project).setEnvironment(environment).build().toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectLocationEnvironmentName(
+      String project, String location, String environment) {
+    return newProjectLocationEnvironmentBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setEnvironment(environment)
+        .build()
+        .toString();
+  }
+
   public static EnvironmentName parse(String formattedString) {
     if (formattedString.isEmpty()) {
       return null;
     }
-    Map<String, String> matchMap =
-        PATH_TEMPLATE.validatedMatch(
-            formattedString, "EnvironmentName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("environment"));
+    if (PROJECT_ENVIRONMENT_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap = PROJECT_ENVIRONMENT_PATH_TEMPLATE.match(formattedString);
+      return ofProjectEnvironmentName(matchMap.get("project"), matchMap.get("environment"));
+    } else if (PROJECT_LOCATION_ENVIRONMENT_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap =
+          PROJECT_LOCATION_ENVIRONMENT_PATH_TEMPLATE.match(formattedString);
+      return ofProjectLocationEnvironmentName(
+          matchMap.get("project"), matchMap.get("location"), matchMap.get("environment"));
+    }
+    throw new ValidationException("JobName.parse: formattedString not in valid format");
   }
 
   public static List<EnvironmentName> parseList(List<String> formattedStrings) {
@@ -84,7 +155,7 @@ public static List<EnvironmentName> parseList(List<String> formattedStrings) {
   }
 
   public static List<String> toStringList(List<EnvironmentName> values) {
-    List<String> list = new ArrayList<String>(values.size());
+    List<String> list = new ArrayList<>(values.size());
     for (EnvironmentName value : values) {
       if (value == null) {
         list.add("");
@@ -96,16 +167,25 @@ public static List<String> toStringList(List<EnvironmentName> values) {
   }
 
   public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
+    return PROJECT_ENVIRONMENT_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_LOCATION_ENVIRONMENT_PATH_TEMPLATE.matches(formattedString);
   }
 
+  @Override
   public Map<String, String> getFieldValuesMap() {
     if (fieldValuesMap == null) {
       synchronized (this) {
         if (fieldValuesMap == null) {
           ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("project", project);
-          fieldMapBuilder.put("environment", environment);
+          if (project != null) {
+            fieldMapBuilder.put("project", project);
+          }
+          if (environment != null) {
+            fieldMapBuilder.put("environment", environment);
+          }
+          if (location != null) {
+            fieldMapBuilder.put("location", location);
+          }
           fieldValuesMap = fieldMapBuilder.build();
         }
       }
@@ -119,15 +199,17 @@ public String getFieldValue(String fieldName) {
 
   @Override
   public String toString() {
-    return PATH_TEMPLATE.instantiate("project", project, "environment", environment);
+    return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
   }
 
-  /** Builder for EnvironmentName. */
+  /** Builder for projects/{project}/agent/environments/{environment}. */
   public static class Builder {
 
     private String project;
     private String environment;
 
+    protected Builder() {}
+
     public String getProject() {
       return project;
     }
@@ -146,9 +228,11 @@ public Builder setEnvironment(String environment) {
       return this;
     }
 
-    private Builder() {}
-
     private Builder(EnvironmentName environmentName) {
+      Preconditions.checkArgument(
+          environmentName.pathTemplate == PROJECT_ENVIRONMENT_PATH_TEMPLATE,
+          "toBuilder is only supported when EnvironmentName has the pattern of "
+              + "projects/{project}/agent/environments/{environment}.");
       project = environmentName.project;
       environment = environmentName.environment;
     }
@@ -158,14 +242,58 @@ public EnvironmentName build() {
     }
   }
 
+  /** Builder for projects/{project}/locations/{location}/agent/environments/{environment}. */
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static class ProjectLocationEnvironmentBuilder {
+
+    private String project;
+    private String location;
+    private String environment;
+
+    private ProjectLocationEnvironmentBuilder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getEnvironment() {
+      return environment;
+    }
+
+    public ProjectLocationEnvironmentBuilder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public ProjectLocationEnvironmentBuilder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public ProjectLocationEnvironmentBuilder setEnvironment(String environment) {
+      this.environment = environment;
+      return this;
+    }
+
+    public EnvironmentName build() {
+      return new EnvironmentName(this);
+    }
+  }
+
   @Override
   public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o instanceof EnvironmentName) {
+    if (o != null || getClass() == o.getClass()) {
       EnvironmentName that = (EnvironmentName) o;
-      return (this.project.equals(that.project)) && (this.environment.equals(that.environment));
+      return (Objects.equals(this.project, that.project))
+          && (Objects.equals(this.environment, that.environment))
+          && (Objects.equals(this.location, that.location));
     }
     return false;
   }
@@ -174,9 +302,13 @@ public boolean equals(Object o) {
   public int hashCode() {
     int h = 1;
     h *= 1000003;
-    h ^= project.hashCode();
+    h ^= Objects.hashCode(fixedValue);
+    h *= 1000003;
+    h ^= Objects.hashCode(project);
+    h *= 1000003;
+    h ^= Objects.hashCode(environment);
     h *= 1000003;
-    h ^= environment.hashCode();
+    h ^= Objects.hashCode(location);
     return h;
   }
 }
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentProto.java
index 3d690456a..c338e78d8 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentProto.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentProto.java
@@ -50,13 +50,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n1google/cloud/dialogflow/v2beta1/enviro"
           + "nment.proto\022\037google.cloud.dialogflow.v2b"
-          + "eta1\032\034google/api/annotations.proto\032\037goog"
-          + "le/api/field_behavior.proto\032\031google/api/"
-          + "resource.proto\0322google/cloud/dialogflow/"
-          + "v2beta1/audio_config.proto\032\033google/proto"
-          + "buf/empty.proto\032 google/protobuf/field_m"
-          + "ask.proto\032\037google/protobuf/timestamp.pro"
-          + "to\032\027google/api/client.proto\"\310\003\n\013Environm"
+          + "eta1\032\034google/api/annotations.proto\032\027goog"
+          + "le/api/client.proto\032\037google/api/field_be"
+          + "havior.proto\032\031google/api/resource.proto\032"
+          + "2google/cloud/dialogflow/v2beta1/audio_c"
+          + "onfig.proto\032\033google/protobuf/empty.proto"
+          + "\032 google/protobuf/field_mask.proto\032\037goog"
+          + "le/protobuf/timestamp.proto\"\310\003\n\013Environm"
           + "ent\022\021\n\004name\030\001 \001(\tB\003\340A\003\022\030\n\013description\030\002 "
           + "\001(\tB\003\340A\001\022\032\n\ragent_version\030\003 \001(\tB\003\340A\001\022F\n\005"
           + "state\030\004 \001(\01622.google.cloud.dialogflow.v2"
@@ -74,35 +74,35 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\001\022\027\n\npage_token\030\003 \001(\tB\003\340A\001\"w\n\030ListEnviro"
           + "nmentsResponse\022B\n\014environments\030\001 \003(\0132,.g"
           + "oogle.cloud.dialogflow.v2beta1.Environme"
-          + "nt\022\027\n\017next_page_token\030\002 \001(\t2\212\003\n\014Environm"
-          + "ents\022\377\001\n\020ListEnvironments\0228.google.cloud"
+          + "nt\022\027\n\017next_page_token\030\002 \001(\t2\223\003\n\014Environm"
+          + "ents\022\210\002\n\020ListEnvironments\0228.google.cloud"
           + ".dialogflow.v2beta1.ListEnvironmentsRequ"
           + "est\0329.google.cloud.dialogflow.v2beta1.Li"
-          + "stEnvironmentsResponse\"v\202\323\344\223\002p\022//v2beta1"
+          + "stEnvironmentsResponse\"\177\202\323\344\223\002p\022//v2beta1"
           + "/{parent=projects/*/agent}/environmentsZ"
           + "=\022;/v2beta1/{parent=projects/*/locations"
-          + "/*/agent}/environments\032x\312A\031dialogflow.go"
-          + "ogleapis.com\322AYhttps://www.googleapis.co"
-          + "m/auth/cloud-platform,https://www.google"
-          + "apis.com/auth/dialogflowB\256\001\n#com.google."
-          + "cloud.dialogflow.v2beta1B\020EnvironmentPro"
-          + "toP\001ZIgoogle.golang.org/genproto/googlea"
-          + "pis/cloud/dialogflow/v2beta1;dialogflow\370"
-          + "\001\001\242\002\002DF\252\002\037Google.Cloud.Dialogflow.V2beta"
-          + "1b\006proto3"
+          + "/*/agent}/environments\332A\006parent\032x\312A\031dial"
+          + "ogflow.googleapis.com\322AYhttps://www.goog"
+          + "leapis.com/auth/cloud-platform,https://w"
+          + "ww.googleapis.com/auth/dialogflowB\256\001\n#co"
+          + "m.google.cloud.dialogflow.v2beta1B\020Envir"
+          + "onmentProtoP\001ZIgoogle.golang.org/genprot"
+          + "o/googleapis/cloud/dialogflow/v2beta1;di"
+          + "alogflow\370\001\001\242\002\002DF\252\002\037Google.Cloud.Dialogfl"
+          + "ow.V2beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
               com.google.api.AnnotationsProto.getDescriptor(),
+              com.google.api.ClientProto.getDescriptor(),
               com.google.api.FieldBehaviorProto.getDescriptor(),
               com.google.api.ResourceProto.getDescriptor(),
               com.google.cloud.dialogflow.v2beta1.AudioConfigProto.getDescriptor(),
               com.google.protobuf.EmptyProto.getDescriptor(),
               com.google.protobuf.FieldMaskProto.getDescriptor(),
               com.google.protobuf.TimestampProto.getDescriptor(),
-              com.google.api.ClientProto.getDescriptor(),
             });
     internal_static_google_cloud_dialogflow_v2beta1_Environment_descriptor =
         getDescriptor().getMessageTypes().get(0);
@@ -133,19 +133,20 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     registry.add(com.google.api.ClientProto.defaultHost);
     registry.add(com.google.api.FieldBehaviorProto.fieldBehavior);
     registry.add(com.google.api.AnnotationsProto.http);
+    registry.add(com.google.api.ClientProto.methodSignature);
     registry.add(com.google.api.ClientProto.oauthScopes);
     registry.add(com.google.api.ResourceProto.resource);
     registry.add(com.google.api.ResourceProto.resourceReference);
     com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor(
         descriptor, registry);
     com.google.api.AnnotationsProto.getDescriptor();
+    com.google.api.ClientProto.getDescriptor();
     com.google.api.FieldBehaviorProto.getDescriptor();
     com.google.api.ResourceProto.getDescriptor();
     com.google.cloud.dialogflow.v2beta1.AudioConfigProto.getDescriptor();
     com.google.protobuf.EmptyProto.getDescriptor();
     com.google.protobuf.FieldMaskProto.getDescriptor();
     com.google.protobuf.TimestampProto.getDescriptor();
-    com.google.api.ClientProto.getDescriptor();
   }
 
   // @@protoc_insertion_point(outer_class_scope)
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java
index 58ed6388b..0c1911675 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java
@@ -129,7 +129,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Format: `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>string parent = 1;</code>
+   * <code>
+   * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
    *
    * @return The parent.
    */
@@ -153,7 +155,9 @@ public java.lang.String getParent() {
    * Format: `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>string parent = 1;</code>
+   * <code>
+   * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
    *
    * @return The bytes for parent.
    */
@@ -571,7 +575,9 @@ public Builder mergeFrom(
      * Format: `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>string parent = 1;</code>
+     * <code>
+     * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
      *
      * @return The parent.
      */
@@ -594,7 +600,9 @@ public java.lang.String getParent() {
      * Format: `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>string parent = 1;</code>
+     * <code>
+     * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
      *
      * @return The bytes for parent.
      */
@@ -617,7 +625,9 @@ public com.google.protobuf.ByteString getParentBytes() {
      * Format: `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>string parent = 1;</code>
+     * <code>
+     * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
      *
      * @param value The parent to set.
      * @return This builder for chaining.
@@ -639,7 +649,9 @@ public Builder setParent(java.lang.String value) {
      * Format: `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>string parent = 1;</code>
+     * <code>
+     * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
      *
      * @return This builder for chaining.
      */
@@ -657,7 +669,9 @@ public Builder clearParent() {
      * Format: `projects/&lt;Project ID&gt;`.
      * </pre>
      *
-     * <code>string parent = 1;</code>
+     * <code>
+     * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * </code>
      *
      * @param value The bytes for parent to set.
      * @return This builder for chaining.
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequestOrBuilder.java
index f9c107496..cc0ce51a9 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequestOrBuilder.java
@@ -31,7 +31,9 @@ public interface ExportAgentRequestOrBuilder
    * Format: `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>string parent = 1;</code>
+   * <code>
+   * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
    *
    * @return The parent.
    */
@@ -44,7 +46,9 @@ public interface ExportAgentRequestOrBuilder
    * Format: `projects/&lt;Project ID&gt;`.
    * </pre>
    *
-   * <code>string parent = 1;</code>
+   * <code>
+   * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * </code>
    *
    * @return The bytes for parent.
    */
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentName.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentName.java
index 85bebefb0..4787b5f0e 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentName.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentName.java
@@ -16,25 +16,37 @@
 
 package com.google.cloud.dialogflow.v2beta1;
 
+import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /** AUTO-GENERATED DOCUMENTATION AND CLASS */
 @javax.annotation.Generated("by GAPIC protoc plugin")
 public class IntentName implements ResourceName {
 
-  private static final PathTemplate PATH_TEMPLATE =
+  @Deprecated
+  protected IntentName() {}
+
+  private static final PathTemplate PROJECT_INTENT_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}/agent/intents/{intent}");
+  private static final PathTemplate PROJECT_LOCATION_INTENT_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/locations/{location}/agent/intents/{intent}");
 
   private volatile Map<String, String> fieldValuesMap;
+  private PathTemplate pathTemplate;
+  private String fixedValue;
 
-  private final String project;
-  private final String intent;
+  private String project;
+  private String intent;
+  private String location;
 
   public String getProject() {
     return project;
@@ -44,35 +56,93 @@ public String getIntent() {
     return intent;
   }
 
+  public String getLocation() {
+    return location;
+  }
+
+  private IntentName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    intent = Preconditions.checkNotNull(builder.getIntent());
+    pathTemplate = PROJECT_INTENT_PATH_TEMPLATE;
+  }
+
+  private IntentName(ProjectLocationIntentBuilder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    intent = Preconditions.checkNotNull(builder.getIntent());
+    pathTemplate = PROJECT_LOCATION_INTENT_PATH_TEMPLATE;
+  }
+
   public static Builder newBuilder() {
     return new Builder();
   }
 
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static Builder newProjectIntentBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static ProjectLocationIntentBuilder newProjectLocationIntentBuilder() {
+    return new ProjectLocationIntentBuilder();
+  }
+
   public Builder toBuilder() {
     return new Builder(this);
   }
 
-  private IntentName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    intent = Preconditions.checkNotNull(builder.getIntent());
+  public static IntentName of(String project, String intent) {
+    return newProjectIntentBuilder().setProject(project).setIntent(intent).build();
   }
 
-  public static IntentName of(String project, String intent) {
-    return newBuilder().setProject(project).setIntent(intent).build();
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static IntentName ofProjectIntentName(String project, String intent) {
+    return newProjectIntentBuilder().setProject(project).setIntent(intent).build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static IntentName ofProjectLocationIntentName(
+      String project, String location, String intent) {
+    return newProjectLocationIntentBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setIntent(intent)
+        .build();
   }
 
   public static String format(String project, String intent) {
     return newBuilder().setProject(project).setIntent(intent).build().toString();
   }
 
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectIntentName(String project, String intent) {
+    return newBuilder().setProject(project).setIntent(intent).build().toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectLocationIntentName(
+      String project, String location, String intent) {
+    return newProjectLocationIntentBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setIntent(intent)
+        .build()
+        .toString();
+  }
+
   public static IntentName parse(String formattedString) {
     if (formattedString.isEmpty()) {
       return null;
     }
-    Map<String, String> matchMap =
-        PATH_TEMPLATE.validatedMatch(
-            formattedString, "IntentName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("intent"));
+    if (PROJECT_INTENT_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap = PROJECT_INTENT_PATH_TEMPLATE.match(formattedString);
+      return ofProjectIntentName(matchMap.get("project"), matchMap.get("intent"));
+    } else if (PROJECT_LOCATION_INTENT_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap = PROJECT_LOCATION_INTENT_PATH_TEMPLATE.match(formattedString);
+      return ofProjectLocationIntentName(
+          matchMap.get("project"), matchMap.get("location"), matchMap.get("intent"));
+    }
+    throw new ValidationException("JobName.parse: formattedString not in valid format");
   }
 
   public static List<IntentName> parseList(List<String> formattedStrings) {
@@ -84,7 +154,7 @@ public static List<IntentName> parseList(List<String> formattedStrings) {
   }
 
   public static List<String> toStringList(List<IntentName> values) {
-    List<String> list = new ArrayList<String>(values.size());
+    List<String> list = new ArrayList<>(values.size());
     for (IntentName value : values) {
       if (value == null) {
         list.add("");
@@ -96,16 +166,25 @@ public static List<String> toStringList(List<IntentName> values) {
   }
 
   public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
+    return PROJECT_INTENT_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_LOCATION_INTENT_PATH_TEMPLATE.matches(formattedString);
   }
 
+  @Override
   public Map<String, String> getFieldValuesMap() {
     if (fieldValuesMap == null) {
       synchronized (this) {
         if (fieldValuesMap == null) {
           ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("project", project);
-          fieldMapBuilder.put("intent", intent);
+          if (project != null) {
+            fieldMapBuilder.put("project", project);
+          }
+          if (intent != null) {
+            fieldMapBuilder.put("intent", intent);
+          }
+          if (location != null) {
+            fieldMapBuilder.put("location", location);
+          }
           fieldValuesMap = fieldMapBuilder.build();
         }
       }
@@ -119,15 +198,17 @@ public String getFieldValue(String fieldName) {
 
   @Override
   public String toString() {
-    return PATH_TEMPLATE.instantiate("project", project, "intent", intent);
+    return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
   }
 
-  /** Builder for IntentName. */
+  /** Builder for projects/{project}/agent/intents/{intent}. */
   public static class Builder {
 
     private String project;
     private String intent;
 
+    protected Builder() {}
+
     public String getProject() {
       return project;
     }
@@ -146,9 +227,11 @@ public Builder setIntent(String intent) {
       return this;
     }
 
-    private Builder() {}
-
     private Builder(IntentName intentName) {
+      Preconditions.checkArgument(
+          intentName.pathTemplate == PROJECT_INTENT_PATH_TEMPLATE,
+          "toBuilder is only supported when IntentName has the pattern of "
+              + "projects/{project}/agent/intents/{intent}.");
       project = intentName.project;
       intent = intentName.intent;
     }
@@ -158,14 +241,58 @@ public IntentName build() {
     }
   }
 
+  /** Builder for projects/{project}/locations/{location}/agent/intents/{intent}. */
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static class ProjectLocationIntentBuilder {
+
+    private String project;
+    private String location;
+    private String intent;
+
+    private ProjectLocationIntentBuilder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getIntent() {
+      return intent;
+    }
+
+    public ProjectLocationIntentBuilder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public ProjectLocationIntentBuilder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public ProjectLocationIntentBuilder setIntent(String intent) {
+      this.intent = intent;
+      return this;
+    }
+
+    public IntentName build() {
+      return new IntentName(this);
+    }
+  }
+
   @Override
   public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o instanceof IntentName) {
+    if (o != null || getClass() == o.getClass()) {
       IntentName that = (IntentName) o;
-      return (this.project.equals(that.project)) && (this.intent.equals(that.intent));
+      return (Objects.equals(this.project, that.project))
+          && (Objects.equals(this.intent, that.intent))
+          && (Objects.equals(this.location, that.location));
     }
     return false;
   }
@@ -174,9 +301,13 @@ public boolean equals(Object o) {
   public int hashCode() {
     int h = 1;
     h *= 1000003;
-    h ^= project.hashCode();
+    h ^= Objects.hashCode(fixedValue);
+    h *= 1000003;
+    h ^= Objects.hashCode(project);
+    h *= 1000003;
+    h ^= Objects.hashCode(intent);
     h *= 1000003;
-    h ^= intent.hashCode();
+    h ^= Objects.hashCode(location);
     return h;
   }
 }
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java
index 0d7a94065..00c5e4212 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/IntentProto.java
@@ -540,96 +540,97 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "(\tB(\340A\002\372A\"\n dialogflow.googleapis.com/In"
           + "tent\022\032\n\rlanguage_code\030\002 \001(\tB\003\340A\001\022@\n\013inte"
           + "nt_view\030\003 \001(\0162+.google.cloud.dialogflow."
-          + "v2beta1.IntentView\"\346\001\n\023CreateIntentReque"
+          + "v2beta1.IntentView\"\353\001\n\023CreateIntentReque"
           + "st\0228\n\006parent\030\001 \001(\tB(\340A\002\372A\"\022 dialogflow.g"
-          + "oogleapis.com/Intent\0227\n\006intent\030\002 \001(\0132\'.g"
-          + "oogle.cloud.dialogflow.v2beta1.Intent\022\032\n"
-          + "\rlanguage_code\030\003 \001(\tB\003\340A\001\022@\n\013intent_view"
-          + "\030\004 \001(\0162+.google.cloud.dialogflow.v2beta1"
-          + ".IntentView\"\335\001\n\023UpdateIntentRequest\0227\n\006i"
-          + "ntent\030\001 \001(\0132\'.google.cloud.dialogflow.v2"
-          + "beta1.Intent\022\032\n\rlanguage_code\030\002 \001(\tB\003\340A\001"
-          + "\022/\n\013update_mask\030\003 \001(\0132\032.google.protobuf."
-          + "FieldMask\022@\n\013intent_view\030\004 \001(\0162+.google."
-          + "cloud.dialogflow.v2beta1.IntentView\"M\n\023D"
-          + "eleteIntentRequest\0226\n\004name\030\001 \001(\tB(\340A\002\372A\""
-          + "\n dialogflow.googleapis.com/Intent\"\335\002\n\031B"
-          + "atchUpdateIntentsRequest\0228\n\006parent\030\001 \001(\t"
-          + "B(\340A\002\372A\"\022 dialogflow.googleapis.com/Inte"
-          + "nt\022\032\n\020intent_batch_uri\030\002 \001(\tH\000\022K\n\023intent"
-          + "_batch_inline\030\003 \001(\0132,.google.cloud.dialo"
-          + "gflow.v2beta1.IntentBatchH\000\022\032\n\rlanguage_"
-          + "code\030\004 \001(\tB\003\340A\001\022/\n\013update_mask\030\005 \001(\0132\032.g"
-          + "oogle.protobuf.FieldMask\022@\n\013intent_view\030"
-          + "\006 \001(\0162+.google.cloud.dialogflow.v2beta1."
-          + "IntentViewB\016\n\014intent_batch\"V\n\032BatchUpdat"
-          + "eIntentsResponse\0228\n\007intents\030\001 \003(\0132\'.goog"
-          + "le.cloud.dialogflow.v2beta1.Intent\"\217\001\n\031B"
-          + "atchDeleteIntentsRequest\0228\n\006parent\030\001 \001(\t"
-          + "B(\340A\002\372A\"\022 dialogflow.googleapis.com/Inte"
-          + "nt\0228\n\007intents\030\002 \003(\0132\'.google.cloud.dialo"
-          + "gflow.v2beta1.Intent\"G\n\013IntentBatch\0228\n\007i"
-          + "ntents\030\001 \003(\0132\'.google.cloud.dialogflow.v"
-          + "2beta1.Intent*?\n\nIntentView\022\033\n\027INTENT_VI"
-          + "EW_UNSPECIFIED\020\000\022\024\n\020INTENT_VIEW_FULL\020\0012\322"
-          + "\020\n\007Intents\022\207\002\n\013ListIntents\0223.google.clou"
-          + "d.dialogflow.v2beta1.ListIntentsRequest\032"
-          + "4.google.cloud.dialogflow.v2beta1.ListIn"
-          + "tentsResponse\"\214\001\202\323\344\223\002f\022*/v2beta1/{parent"
-          + "=projects/*/agent}/intentsZ8\0226/v2beta1/{"
-          + "parent=projects/*/locations/*/agent}/int"
-          + "ents\332A\006parent\332A\024parent,language_code\022\362\001\n"
-          + "\tGetIntent\0221.google.cloud.dialogflow.v2b"
-          + "eta1.GetIntentRequest\032\'.google.cloud.dia"
-          + "logflow.v2beta1.Intent\"\210\001\202\323\344\223\002f\022*/v2beta"
-          + "1/{name=projects/*/agent/intents/*}Z8\0226/"
-          + "v2beta1/{name=projects/*/locations/*/age"
-          + "nt/intents/*}\332A\004name\332A\022name,language_cod"
-          + "e\022\232\002\n\014CreateIntent\0224.google.cloud.dialog"
-          + "flow.v2beta1.CreateIntentRequest\032\'.googl"
-          + "e.cloud.dialogflow.v2beta1.Intent\"\252\001\202\323\344\223"
-          + "\002v\"*/v2beta1/{parent=projects/*/agent}/i"
-          + "ntents:\006intentZ@\"6/v2beta1/{parent=proje"
-          + "cts/*/locations/*/agent}/intents:\006intent"
-          + "\332A\rparent,intent\332A\033parent,intent,languag"
-          + "e_code\022\323\002\n\014UpdateIntent\0224.google.cloud.d"
-          + "ialogflow.v2beta1.UpdateIntentRequest\032\'."
-          + "google.cloud.dialogflow.v2beta1.Intent\"\343"
-          + "\001\202\323\344\223\002\204\00121/v2beta1/{intent.name=projects"
-          + "/*/agent/intents/*}:\006intentZG2=/v2beta1/"
-          + "{intent.name=projects/*/locations/*/agen"
-          + "t/intents/*}:\006intent\332A\022intent,update_mas"
-          + "k\332A\006intent\332A\024intent,language_code\332A inte"
-          + "nt,language_code,update_mask\022\321\001\n\014DeleteI"
-          + "ntent\0224.google.cloud.dialogflow.v2beta1."
-          + "DeleteIntentRequest\032\026.google.protobuf.Em"
-          + "pty\"s\202\323\344\223\002f**/v2beta1/{name=projects/*/a"
-          + "gent/intents/*}Z8*6/v2beta1/{name=projec"
-          + "ts/*/locations/*/agent/intents/*}\332A\004name"
-          + "\022\324\002\n\022BatchUpdateIntents\022:.google.cloud.d"
-          + "ialogflow.v2beta1.BatchUpdateIntentsRequ"
-          + "est\032\035.google.longrunning.Operation\"\342\001\202\323\344"
-          + "\223\002\204\001\"6/v2beta1/{parent=projects/*/agent}"
-          + "/intents:batchUpdate:\001*ZG\"B/v2beta1/{par"
-          + "ent=projects/*/locations/*/agent}/intent"
-          + "s:batchUpdate:\001*\312AT\n:google.cloud.dialog"
-          + "flow.v2beta1.BatchUpdateIntentsResponse\022"
-          + "\026google.protobuf.Struct\022\257\002\n\022BatchDeleteI"
-          + "ntents\022:.google.cloud.dialogflow.v2beta1"
-          + ".BatchDeleteIntentsRequest\032\035.google.long"
-          + "running.Operation\"\275\001\202\323\344\223\002\204\001\"6/v2beta1/{p"
-          + "arent=projects/*/agent}/intents:batchDel"
-          + "ete:\001*ZG\"B/v2beta1/{parent=projects/*/lo"
-          + "cations/*/agent}/intents:batchDelete:\001*\312"
-          + "A/\n\025google.protobuf.Empty\022\026google.protob"
-          + "uf.Struct\032x\312A\031dialogflow.googleapis.com\322"
-          + "AYhttps://www.googleapis.com/auth/cloud-"
-          + "platform,https://www.googleapis.com/auth"
-          + "/dialogflowB\251\001\n#com.google.cloud.dialogf"
-          + "low.v2beta1B\013IntentProtoP\001ZIgoogle.golan"
-          + "g.org/genproto/googleapis/cloud/dialogfl"
-          + "ow/v2beta1;dialogflow\370\001\001\242\002\002DF\252\002\037Google.C"
-          + "loud.Dialogflow.V2beta1b\006proto3"
+          + "oogleapis.com/Intent\022<\n\006intent\030\002 \001(\0132\'.g"
+          + "oogle.cloud.dialogflow.v2beta1.IntentB\003\340"
+          + "A\002\022\032\n\rlanguage_code\030\003 \001(\tB\003\340A\001\022@\n\013intent"
+          + "_view\030\004 \001(\0162+.google.cloud.dialogflow.v2"
+          + "beta1.IntentView\"\342\001\n\023UpdateIntentRequest"
+          + "\022<\n\006intent\030\001 \001(\0132\'.google.cloud.dialogfl"
+          + "ow.v2beta1.IntentB\003\340A\002\022\032\n\rlanguage_code\030"
+          + "\002 \001(\tB\003\340A\001\022/\n\013update_mask\030\003 \001(\0132\032.google"
+          + ".protobuf.FieldMask\022@\n\013intent_view\030\004 \001(\016"
+          + "2+.google.cloud.dialogflow.v2beta1.Inten"
+          + "tView\"M\n\023DeleteIntentRequest\0226\n\004name\030\001 \001"
+          + "(\tB(\340A\002\372A\"\n dialogflow.googleapis.com/In"
+          + "tent\"\335\002\n\031BatchUpdateIntentsRequest\0228\n\006pa"
+          + "rent\030\001 \001(\tB(\340A\002\372A\"\022 dialogflow.googleapi"
+          + "s.com/Intent\022\032\n\020intent_batch_uri\030\002 \001(\tH\000"
+          + "\022K\n\023intent_batch_inline\030\003 \001(\0132,.google.c"
+          + "loud.dialogflow.v2beta1.IntentBatchH\000\022\032\n"
+          + "\rlanguage_code\030\004 \001(\tB\003\340A\001\022/\n\013update_mask"
+          + "\030\005 \001(\0132\032.google.protobuf.FieldMask\022@\n\013in"
+          + "tent_view\030\006 \001(\0162+.google.cloud.dialogflo"
+          + "w.v2beta1.IntentViewB\016\n\014intent_batch\"V\n\032"
+          + "BatchUpdateIntentsResponse\0228\n\007intents\030\001 "
+          + "\003(\0132\'.google.cloud.dialogflow.v2beta1.In"
+          + "tent\"\224\001\n\031BatchDeleteIntentsRequest\0228\n\006pa"
+          + "rent\030\001 \001(\tB(\340A\002\372A\"\022 dialogflow.googleapi"
+          + "s.com/Intent\022=\n\007intents\030\002 \003(\0132\'.google.c"
+          + "loud.dialogflow.v2beta1.IntentB\003\340A\002\"G\n\013I"
+          + "ntentBatch\0228\n\007intents\030\001 \003(\0132\'.google.clo"
+          + "ud.dialogflow.v2beta1.Intent*?\n\nIntentVi"
+          + "ew\022\033\n\027INTENT_VIEW_UNSPECIFIED\020\000\022\024\n\020INTEN"
+          + "T_VIEW_FULL\020\0012\343\020\n\007Intents\022\207\002\n\013ListIntent"
+          + "s\0223.google.cloud.dialogflow.v2beta1.List"
+          + "IntentsRequest\0324.google.cloud.dialogflow"
+          + ".v2beta1.ListIntentsResponse\"\214\001\202\323\344\223\002f\022*/"
+          + "v2beta1/{parent=projects/*/agent}/intent"
+          + "sZ8\0226/v2beta1/{parent=projects/*/locatio"
+          + "ns/*/agent}/intents\332A\006parent\332A\024parent,la"
+          + "nguage_code\022\362\001\n\tGetIntent\0221.google.cloud"
+          + ".dialogflow.v2beta1.GetIntentRequest\032\'.g"
+          + "oogle.cloud.dialogflow.v2beta1.Intent\"\210\001"
+          + "\202\323\344\223\002f\022*/v2beta1/{name=projects/*/agent/"
+          + "intents/*}Z8\0226/v2beta1/{name=projects/*/"
+          + "locations/*/agent/intents/*}\332A\004name\332A\022na"
+          + "me,language_code\022\232\002\n\014CreateIntent\0224.goog"
+          + "le.cloud.dialogflow.v2beta1.CreateIntent"
+          + "Request\032\'.google.cloud.dialogflow.v2beta"
+          + "1.Intent\"\252\001\202\323\344\223\002v\"*/v2beta1/{parent=proj"
+          + "ects/*/agent}/intents:\006intentZ@\"6/v2beta"
+          + "1/{parent=projects/*/locations/*/agent}/"
+          + "intents:\006intent\332A\rparent,intent\332A\033parent"
+          + ",intent,language_code\022\323\002\n\014UpdateIntent\0224"
+          + ".google.cloud.dialogflow.v2beta1.UpdateI"
+          + "ntentRequest\032\'.google.cloud.dialogflow.v"
+          + "2beta1.Intent\"\343\001\202\323\344\223\002\204\00121/v2beta1/{inten"
+          + "t.name=projects/*/agent/intents/*}:\006inte"
+          + "ntZG2=/v2beta1/{intent.name=projects/*/l"
+          + "ocations/*/agent/intents/*}:\006intent\332A\022in"
+          + "tent,update_mask\332A\006intent\332A\024intent,langu"
+          + "age_code\332A intent,language_code,update_m"
+          + "ask\022\321\001\n\014DeleteIntent\0224.google.cloud.dial"
+          + "ogflow.v2beta1.DeleteIntentRequest\032\026.goo"
+          + "gle.protobuf.Empty\"s\202\323\344\223\002f**/v2beta1/{na"
+          + "me=projects/*/agent/intents/*}Z8*6/v2bet"
+          + "a1/{name=projects/*/locations/*/agent/in"
+          + "tents/*}\332A\004name\022\324\002\n\022BatchUpdateIntents\022:"
+          + ".google.cloud.dialogflow.v2beta1.BatchUp"
+          + "dateIntentsRequest\032\035.google.longrunning."
+          + "Operation\"\342\001\202\323\344\223\002\204\001\"6/v2beta1/{parent=pr"
+          + "ojects/*/agent}/intents:batchUpdate:\001*ZG"
+          + "\"B/v2beta1/{parent=projects/*/locations/"
+          + "*/agent}/intents:batchUpdate:\001*\312AT\n:goog"
+          + "le.cloud.dialogflow.v2beta1.BatchUpdateI"
+          + "ntentsResponse\022\026google.protobuf.Struct\022\300"
+          + "\002\n\022BatchDeleteIntents\022:.google.cloud.dia"
+          + "logflow.v2beta1.BatchDeleteIntentsReques"
+          + "t\032\035.google.longrunning.Operation\"\316\001\202\323\344\223\002"
+          + "\204\001\"6/v2beta1/{parent=projects/*/agent}/i"
+          + "ntents:batchDelete:\001*ZG\"B/v2beta1/{paren"
+          + "t=projects/*/locations/*/agent}/intents:"
+          + "batchDelete:\001*\332A\016parent,intents\312A/\n\025goog"
+          + "le.protobuf.Empty\022\026google.protobuf.Struc"
+          + "t\032x\312A\031dialogflow.googleapis.com\322AYhttps:"
+          + "//www.googleapis.com/auth/cloud-platform"
+          + ",https://www.googleapis.com/auth/dialogf"
+          + "lowB\251\001\n#com.google.cloud.dialogflow.v2be"
+          + "ta1B\013IntentProtoP\001ZIgoogle.golang.org/ge"
+          + "nproto/googleapis/cloud/dialogflow/v2bet"
+          + "a1;dialogflow\370\001\001\242\002\002DF\252\002\037Google.Cloud.Dia"
+          + "logflow.V2beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBaseProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBaseProto.java
index f7a48a4c5..1ba30cb3b 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBaseProto.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/KnowledgeBaseProto.java
@@ -95,7 +95,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "K\n\016knowledge_base\030\001 \001(\0132..google.cloud.d"
           + "ialogflow.v2beta1.KnowledgeBaseB\003\340A\002\0224\n\013"
           + "update_mask\030\002 \001(\0132\032.google.protobuf.Fiel"
-          + "dMaskB\003\340A\0012\320\013\n\016KnowledgeBases\022\200\002\n\022ListKn"
+          + "dMaskB\003\340A\0012\341\013\n\016KnowledgeBases\022\200\002\n\022ListKn"
           + "owledgeBases\022:.google.cloud.dialogflow.v"
           + "2beta1.ListKnowledgeBasesRequest\032;.googl"
           + "e.cloud.dialogflow.v2beta1.ListKnowledge"
@@ -121,23 +121,23 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "protobuf.Empty\"o\202\323\344\223\002b*+/v2beta1/{name=p"
           + "rojects/*/knowledgeBases/*}Z3*1/v2beta1/"
           + "{name=projects/*/agent/knowledgeBases/*}"
-          + "\332A\004name\022\311\002\n\023UpdateKnowledgeBase\022;.google"
+          + "\332A\004name\022\332\002\n\023UpdateKnowledgeBase\022;.google"
           + ".cloud.dialogflow.v2beta1.UpdateKnowledg"
           + "eBaseRequest\032..google.cloud.dialogflow.v"
-          + "2beta1.KnowledgeBase\"\304\001\202\323\344\223\002\240\0012:/v2beta1"
+          + "2beta1.KnowledgeBase\"\325\001\202\323\344\223\002\240\0012:/v2beta1"
           + "/{knowledge_base.name=projects/*/knowled"
           + "geBases/*}:\016knowledge_baseZR2@/v2beta1/{"
           + "knowledge_base.name=projects/*/agent/kno"
           + "wledgeBases/*}:\016knowledge_base\332A\032knowled"
-          + "ge_base,update_mask\032x\312A\031dialogflow.googl"
-          + "eapis.com\322AYhttps://www.googleapis.com/a"
-          + "uth/cloud-platform,https://www.googleapi"
-          + "s.com/auth/dialogflowB\260\001\n#com.google.clo"
-          + "ud.dialogflow.v2beta1B\022KnowledgeBaseProt"
-          + "oP\001ZIgoogle.golang.org/genproto/googleap"
-          + "is/cloud/dialogflow/v2beta1;dialogflow\370\001"
-          + "\001\242\002\002DF\252\002\037Google.Cloud.Dialogflow.V2beta1"
-          + "b\006proto3"
+          + "ge_base,update_mask\332A\016knowledge_base\032x\312A"
+          + "\031dialogflow.googleapis.com\322AYhttps://www"
+          + ".googleapis.com/auth/cloud-platform,http"
+          + "s://www.googleapis.com/auth/dialogflowB\260"
+          + "\001\n#com.google.cloud.dialogflow.v2beta1B\022"
+          + "KnowledgeBaseProtoP\001ZIgoogle.golang.org/"
+          + "genproto/googleapis/cloud/dialogflow/v2b"
+          + "eta1;dialogflow\370\001\001\242\002\002DF\252\002\037Google.Cloud.D"
+          + "ialogflow.V2beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/LocationName.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/LocationName.java
new file mode 100644
index 000000000..833b61c85
--- /dev/null
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/LocationName.java
@@ -0,0 +1,182 @@
+/*
+ * 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.
+ */
+
+package com.google.cloud.dialogflow.v2beta1;
+
+import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.resourcenames.ResourceName;
+import com.google.common.base.Preconditions;
+import com.google.common.collect.ImmutableMap;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/** AUTO-GENERATED DOCUMENTATION AND CLASS */
+@javax.annotation.Generated("by GAPIC protoc plugin")
+public class LocationName implements ResourceName {
+
+  private static final PathTemplate PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding("projects/{project}/locations/{location}");
+
+  private volatile Map<String, String> fieldValuesMap;
+
+  private final String project;
+  private final String location;
+
+  public String getProject() {
+    return project;
+  }
+
+  public String getLocation() {
+    return location;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
+  }
+
+  private LocationName(Builder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+  }
+
+  public static LocationName of(String project, String location) {
+    return newBuilder().setProject(project).setLocation(location).build();
+  }
+
+  public static String format(String project, String location) {
+    return newBuilder().setProject(project).setLocation(location).build().toString();
+  }
+
+  public static LocationName parse(String formattedString) {
+    if (formattedString.isEmpty()) {
+      return null;
+    }
+    Map<String, String> matchMap =
+        PATH_TEMPLATE.validatedMatch(
+            formattedString, "LocationName.parse: formattedString not in valid format");
+    return of(matchMap.get("project"), matchMap.get("location"));
+  }
+
+  public static List<LocationName> parseList(List<String> formattedStrings) {
+    List<LocationName> list = new ArrayList<>(formattedStrings.size());
+    for (String formattedString : formattedStrings) {
+      list.add(parse(formattedString));
+    }
+    return list;
+  }
+
+  public static List<String> toStringList(List<LocationName> values) {
+    List<String> list = new ArrayList<String>(values.size());
+    for (LocationName value : values) {
+      if (value == null) {
+        list.add("");
+      } else {
+        list.add(value.toString());
+      }
+    }
+    return list;
+  }
+
+  public static boolean isParsableFrom(String formattedString) {
+    return PATH_TEMPLATE.matches(formattedString);
+  }
+
+  public Map<String, String> getFieldValuesMap() {
+    if (fieldValuesMap == null) {
+      synchronized (this) {
+        if (fieldValuesMap == null) {
+          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
+          fieldMapBuilder.put("project", project);
+          fieldMapBuilder.put("location", location);
+          fieldValuesMap = fieldMapBuilder.build();
+        }
+      }
+    }
+    return fieldValuesMap;
+  }
+
+  public String getFieldValue(String fieldName) {
+    return getFieldValuesMap().get(fieldName);
+  }
+
+  @Override
+  public String toString() {
+    return PATH_TEMPLATE.instantiate("project", project, "location", location);
+  }
+
+  /** Builder for LocationName. */
+  public static class Builder {
+
+    private String project;
+    private String location;
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public Builder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public Builder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    private Builder() {}
+
+    private Builder(LocationName locationName) {
+      project = locationName.project;
+      location = locationName.location;
+    }
+
+    public LocationName build() {
+      return new LocationName(this);
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == this) {
+      return true;
+    }
+    if (o instanceof LocationName) {
+      LocationName that = (LocationName) o;
+      return (this.project.equals(that.project)) && (this.location.equals(that.location));
+    }
+    return false;
+  }
+
+  @Override
+  public int hashCode() {
+    int h = 1;
+    h *= 1000003;
+    h ^= project.hashCode();
+    h *= 1000003;
+    h ^= location.hashCode();
+    return h;
+  }
+}
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeName.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeName.java
index d873ce065..05b9dc14b 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeName.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeName.java
@@ -16,27 +16,44 @@
 
 package com.google.cloud.dialogflow.v2beta1;
 
+import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /** AUTO-GENERATED DOCUMENTATION AND CLASS */
 @javax.annotation.Generated("by GAPIC protoc plugin")
 public class SessionEntityTypeName implements ResourceName {
 
-  private static final PathTemplate PATH_TEMPLATE =
+  @Deprecated
+  protected SessionEntityTypeName() {}
+
+  private static final PathTemplate PROJECT_SESSION_ENTITY_TYPE_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding(
           "projects/{project}/agent/sessions/{session}/entityTypes/{entity_type}");
+  private static final PathTemplate PROJECT_LOCATION_SESSION_ENTITY_TYPE_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/locations/{location}/agent/sessions/{session}/entityTypes/{entity_type}");
+  private static final PathTemplate PROJECT_ENVIRONMENT_USER_SESSION_ENTITY_TYPE_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/agent/environments/{environment}/users/{user}/sessions/{session}/entityTypes/{entity_type}");
 
   private volatile Map<String, String> fieldValuesMap;
+  private PathTemplate pathTemplate;
+  private String fixedValue;
 
-  private final String project;
-  private final String session;
-  private final String entityType;
+  private String project;
+  private String session;
+  private String entityType;
+  private String location;
+  private String environment;
+  private String user;
 
   public String getProject() {
     return project;
@@ -50,22 +67,106 @@ public String getEntityType() {
     return entityType;
   }
 
-  public static Builder newBuilder() {
-    return new Builder();
+  public String getLocation() {
+    return location;
   }
 
-  public Builder toBuilder() {
-    return new Builder(this);
+  public String getEnvironment() {
+    return environment;
+  }
+
+  public String getUser() {
+    return user;
   }
 
   private SessionEntityTypeName(Builder builder) {
     project = Preconditions.checkNotNull(builder.getProject());
     session = Preconditions.checkNotNull(builder.getSession());
     entityType = Preconditions.checkNotNull(builder.getEntityType());
+    pathTemplate = PROJECT_SESSION_ENTITY_TYPE_PATH_TEMPLATE;
+  }
+
+  private SessionEntityTypeName(ProjectLocationSessionEntityTypeBuilder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    session = Preconditions.checkNotNull(builder.getSession());
+    entityType = Preconditions.checkNotNull(builder.getEntityType());
+    pathTemplate = PROJECT_LOCATION_SESSION_ENTITY_TYPE_PATH_TEMPLATE;
+  }
+
+  private SessionEntityTypeName(ProjectEnvironmentUserSessionEntityTypeBuilder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    environment = Preconditions.checkNotNull(builder.getEnvironment());
+    user = Preconditions.checkNotNull(builder.getUser());
+    session = Preconditions.checkNotNull(builder.getSession());
+    entityType = Preconditions.checkNotNull(builder.getEntityType());
+    pathTemplate = PROJECT_ENVIRONMENT_USER_SESSION_ENTITY_TYPE_PATH_TEMPLATE;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static Builder newProjectSessionEntityTypeBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static ProjectLocationSessionEntityTypeBuilder
+      newProjectLocationSessionEntityTypeBuilder() {
+    return new ProjectLocationSessionEntityTypeBuilder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static ProjectEnvironmentUserSessionEntityTypeBuilder
+      newProjectEnvironmentUserSessionEntityTypeBuilder() {
+    return new ProjectEnvironmentUserSessionEntityTypeBuilder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
   }
 
   public static SessionEntityTypeName of(String project, String session, String entityType) {
-    return newBuilder().setProject(project).setSession(session).setEntityType(entityType).build();
+    return newProjectSessionEntityTypeBuilder()
+        .setProject(project)
+        .setSession(session)
+        .setEntityType(entityType)
+        .build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static SessionEntityTypeName ofProjectSessionEntityTypeName(
+      String project, String session, String entityType) {
+    return newProjectSessionEntityTypeBuilder()
+        .setProject(project)
+        .setSession(session)
+        .setEntityType(entityType)
+        .build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static SessionEntityTypeName ofProjectLocationSessionEntityTypeName(
+      String project, String location, String session, String entityType) {
+    return newProjectLocationSessionEntityTypeBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setSession(session)
+        .setEntityType(entityType)
+        .build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static SessionEntityTypeName ofProjectEnvironmentUserSessionEntityTypeName(
+      String project, String environment, String user, String session, String entityType) {
+    return newProjectEnvironmentUserSessionEntityTypeBuilder()
+        .setProject(project)
+        .setEnvironment(environment)
+        .setUser(user)
+        .setSession(session)
+        .setEntityType(entityType)
+        .build();
   }
 
   public static String format(String project, String session, String entityType) {
@@ -77,14 +178,71 @@ public static String format(String project, String session, String entityType) {
         .toString();
   }
 
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectSessionEntityTypeName(
+      String project, String session, String entityType) {
+    return newBuilder()
+        .setProject(project)
+        .setSession(session)
+        .setEntityType(entityType)
+        .build()
+        .toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectLocationSessionEntityTypeName(
+      String project, String location, String session, String entityType) {
+    return newProjectLocationSessionEntityTypeBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setSession(session)
+        .setEntityType(entityType)
+        .build()
+        .toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectEnvironmentUserSessionEntityTypeName(
+      String project, String environment, String user, String session, String entityType) {
+    return newProjectEnvironmentUserSessionEntityTypeBuilder()
+        .setProject(project)
+        .setEnvironment(environment)
+        .setUser(user)
+        .setSession(session)
+        .setEntityType(entityType)
+        .build()
+        .toString();
+  }
+
   public static SessionEntityTypeName parse(String formattedString) {
     if (formattedString.isEmpty()) {
       return null;
     }
-    Map<String, String> matchMap =
-        PATH_TEMPLATE.validatedMatch(
-            formattedString, "SessionEntityTypeName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("session"), matchMap.get("entity_type"));
+    if (PROJECT_SESSION_ENTITY_TYPE_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap =
+          PROJECT_SESSION_ENTITY_TYPE_PATH_TEMPLATE.match(formattedString);
+      return ofProjectSessionEntityTypeName(
+          matchMap.get("project"), matchMap.get("session"), matchMap.get("entity_type"));
+    } else if (PROJECT_LOCATION_SESSION_ENTITY_TYPE_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap =
+          PROJECT_LOCATION_SESSION_ENTITY_TYPE_PATH_TEMPLATE.match(formattedString);
+      return ofProjectLocationSessionEntityTypeName(
+          matchMap.get("project"),
+          matchMap.get("location"),
+          matchMap.get("session"),
+          matchMap.get("entity_type"));
+    } else if (PROJECT_ENVIRONMENT_USER_SESSION_ENTITY_TYPE_PATH_TEMPLATE.matches(
+        formattedString)) {
+      Map<String, String> matchMap =
+          PROJECT_ENVIRONMENT_USER_SESSION_ENTITY_TYPE_PATH_TEMPLATE.match(formattedString);
+      return ofProjectEnvironmentUserSessionEntityTypeName(
+          matchMap.get("project"),
+          matchMap.get("environment"),
+          matchMap.get("user"),
+          matchMap.get("session"),
+          matchMap.get("entity_type"));
+    }
+    throw new ValidationException("JobName.parse: formattedString not in valid format");
   }
 
   public static List<SessionEntityTypeName> parseList(List<String> formattedStrings) {
@@ -96,7 +254,7 @@ public static List<SessionEntityTypeName> parseList(List<String> formattedString
   }
 
   public static List<String> toStringList(List<SessionEntityTypeName> values) {
-    List<String> list = new ArrayList<String>(values.size());
+    List<String> list = new ArrayList<>(values.size());
     for (SessionEntityTypeName value : values) {
       if (value == null) {
         list.add("");
@@ -108,17 +266,35 @@ public static List<String> toStringList(List<SessionEntityTypeName> values) {
   }
 
   public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
+    return PROJECT_SESSION_ENTITY_TYPE_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_LOCATION_SESSION_ENTITY_TYPE_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_ENVIRONMENT_USER_SESSION_ENTITY_TYPE_PATH_TEMPLATE.matches(formattedString);
   }
 
+  @Override
   public Map<String, String> getFieldValuesMap() {
     if (fieldValuesMap == null) {
       synchronized (this) {
         if (fieldValuesMap == null) {
           ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("project", project);
-          fieldMapBuilder.put("session", session);
-          fieldMapBuilder.put("entityType", entityType);
+          if (project != null) {
+            fieldMapBuilder.put("project", project);
+          }
+          if (session != null) {
+            fieldMapBuilder.put("session", session);
+          }
+          if (entityType != null) {
+            fieldMapBuilder.put("entity_type", entityType);
+          }
+          if (location != null) {
+            fieldMapBuilder.put("location", location);
+          }
+          if (environment != null) {
+            fieldMapBuilder.put("environment", environment);
+          }
+          if (user != null) {
+            fieldMapBuilder.put("user", user);
+          }
           fieldValuesMap = fieldMapBuilder.build();
         }
       }
@@ -132,17 +308,18 @@ public String getFieldValue(String fieldName) {
 
   @Override
   public String toString() {
-    return PATH_TEMPLATE.instantiate(
-        "project", project, "session", session, "entity_type", entityType);
+    return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
   }
 
-  /** Builder for SessionEntityTypeName. */
+  /** Builder for projects/{project}/agent/sessions/{session}/entityTypes/{entity_type}. */
   public static class Builder {
 
     private String project;
     private String session;
     private String entityType;
 
+    protected Builder() {}
+
     public String getProject() {
       return project;
     }
@@ -170,9 +347,11 @@ public Builder setEntityType(String entityType) {
       return this;
     }
 
-    private Builder() {}
-
     private Builder(SessionEntityTypeName sessionEntityTypeName) {
+      Preconditions.checkArgument(
+          sessionEntityTypeName.pathTemplate == PROJECT_SESSION_ENTITY_TYPE_PATH_TEMPLATE,
+          "toBuilder is only supported when SessionEntityTypeName has the pattern of "
+              + "projects/{project}/agent/sessions/{session}/entityTypes/{entity_type}.");
       project = sessionEntityTypeName.project;
       session = sessionEntityTypeName.session;
       entityType = sessionEntityTypeName.entityType;
@@ -183,16 +362,139 @@ public SessionEntityTypeName build() {
     }
   }
 
+  /**
+   * Builder for
+   * projects/{project}/locations/{location}/agent/sessions/{session}/entityTypes/{entity_type}.
+   */
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static class ProjectLocationSessionEntityTypeBuilder {
+
+    private String project;
+    private String location;
+    private String session;
+    private String entityType;
+
+    private ProjectLocationSessionEntityTypeBuilder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getSession() {
+      return session;
+    }
+
+    public String getEntityType() {
+      return entityType;
+    }
+
+    public ProjectLocationSessionEntityTypeBuilder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public ProjectLocationSessionEntityTypeBuilder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public ProjectLocationSessionEntityTypeBuilder setSession(String session) {
+      this.session = session;
+      return this;
+    }
+
+    public ProjectLocationSessionEntityTypeBuilder setEntityType(String entityType) {
+      this.entityType = entityType;
+      return this;
+    }
+
+    public SessionEntityTypeName build() {
+      return new SessionEntityTypeName(this);
+    }
+  }
+
+  /**
+   * Builder for
+   * projects/{project}/agent/environments/{environment}/users/{user}/sessions/{session}/entityTypes/{entity_type}.
+   */
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static class ProjectEnvironmentUserSessionEntityTypeBuilder {
+
+    private String project;
+    private String environment;
+    private String user;
+    private String session;
+    private String entityType;
+
+    private ProjectEnvironmentUserSessionEntityTypeBuilder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getEnvironment() {
+      return environment;
+    }
+
+    public String getUser() {
+      return user;
+    }
+
+    public String getSession() {
+      return session;
+    }
+
+    public String getEntityType() {
+      return entityType;
+    }
+
+    public ProjectEnvironmentUserSessionEntityTypeBuilder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionEntityTypeBuilder setEnvironment(String environment) {
+      this.environment = environment;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionEntityTypeBuilder setUser(String user) {
+      this.user = user;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionEntityTypeBuilder setSession(String session) {
+      this.session = session;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionEntityTypeBuilder setEntityType(String entityType) {
+      this.entityType = entityType;
+      return this;
+    }
+
+    public SessionEntityTypeName build() {
+      return new SessionEntityTypeName(this);
+    }
+  }
+
   @Override
   public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o instanceof SessionEntityTypeName) {
+    if (o != null || getClass() == o.getClass()) {
       SessionEntityTypeName that = (SessionEntityTypeName) o;
-      return (this.project.equals(that.project))
-          && (this.session.equals(that.session))
-          && (this.entityType.equals(that.entityType));
+      return (Objects.equals(this.project, that.project))
+          && (Objects.equals(this.session, that.session))
+          && (Objects.equals(this.entityType, that.entityType))
+          && (Objects.equals(this.location, that.location))
+          && (Objects.equals(this.environment, that.environment))
+          && (Objects.equals(this.user, that.user));
     }
     return false;
   }
@@ -201,11 +503,19 @@ public boolean equals(Object o) {
   public int hashCode() {
     int h = 1;
     h *= 1000003;
-    h ^= project.hashCode();
+    h ^= Objects.hashCode(fixedValue);
+    h *= 1000003;
+    h ^= Objects.hashCode(project);
+    h *= 1000003;
+    h ^= Objects.hashCode(session);
+    h *= 1000003;
+    h ^= Objects.hashCode(entityType);
+    h *= 1000003;
+    h ^= Objects.hashCode(location);
     h *= 1000003;
-    h ^= session.hashCode();
+    h ^= Objects.hashCode(environment);
     h *= 1000003;
-    h ^= entityType.hashCode();
+    h ^= Objects.hashCode(user);
     return h;
   }
 }
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeProto.java
index 700b49f02..ada4203e6 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeProto.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionEntityTypeProto.java
@@ -98,93 +98,93 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "tyType\022\027\n\017next_page_token\030\002 \001(\t\"`\n\033GetSe"
           + "ssionEntityTypeRequest\022A\n\004name\030\001 \001(\tB3\340A"
           + "\002\372A-\n+dialogflow.googleapis.com/SessionE"
-          + "ntityType\"\266\001\n\036CreateSessionEntityTypeReq"
+          + "ntityType\"\273\001\n\036CreateSessionEntityTypeReq"
           + "uest\022C\n\006parent\030\001 \001(\tB3\340A\002\372A-\022+dialogflow"
-          + ".googleapis.com/SessionEntityType\022O\n\023ses"
+          + ".googleapis.com/SessionEntityType\022T\n\023ses"
           + "sion_entity_type\030\002 \001(\01322.google.cloud.di"
-          + "alogflow.v2beta1.SessionEntityType\"\242\001\n\036U"
-          + "pdateSessionEntityTypeRequest\022O\n\023session"
-          + "_entity_type\030\001 \001(\01322.google.cloud.dialog"
-          + "flow.v2beta1.SessionEntityType\022/\n\013update"
-          + "_mask\030\002 \001(\0132\032.google.protobuf.FieldMask\""
-          + "c\n\036DeleteSessionEntityTypeRequest\022A\n\004nam"
-          + "e\030\001 \001(\tB3\340A\002\372A-\n+dialogflow.googleapis.c"
-          + "om/SessionEntityType2\373\025\n\022SessionEntityTy"
-          + "pes\022\344\003\n\026ListSessionEntityTypes\022>.google."
-          + "cloud.dialogflow.v2beta1.ListSessionEnti"
-          + "tyTypesRequest\032?.google.cloud.dialogflow"
-          + ".v2beta1.ListSessionEntityTypesResponse\""
-          + "\310\002\202\323\344\223\002\270\002\0229/v2beta1/{parent=projects/*/a"
-          + "gent/sessions/*}/entityTypesZR\022P/v2beta1"
-          + "/{parent=projects/*/agent/environments/*"
-          + "/users/*/sessions/*}/entityTypesZG\022E/v2b"
-          + "eta1/{parent=projects/*/locations/*/agen"
-          + "t/sessions/*}/entityTypesZ^\022\\/v2beta1/{p"
-          + "arent=projects/*/locations/*/agent/envir"
-          + "onments/*/users/*/sessions/*}/entityType"
-          + "s\332A\006parent\022\321\003\n\024GetSessionEntityType\022<.go"
-          + "ogle.cloud.dialogflow.v2beta1.GetSession"
-          + "EntityTypeRequest\0322.google.cloud.dialogf"
-          + "low.v2beta1.SessionEntityType\"\306\002\202\323\344\223\002\270\002\022"
-          + "9/v2beta1/{name=projects/*/agent/session"
-          + "s/*/entityTypes/*}ZR\022P/v2beta1/{name=pro"
-          + "jects/*/agent/environments/*/users/*/ses"
-          + "sions/*/entityTypes/*}ZG\022E/v2beta1/{name"
-          + "=projects/*/locations/*/agent/sessions/*"
-          + "/entityTypes/*}Z^\022\\/v2beta1/{name=projec"
-          + "ts/*/locations/*/agent/environments/*/us"
-          + "ers/*/sessions/*/entityTypes/*}\332A\004name\022\301"
-          + "\004\n\027CreateSessionEntityType\022?.google.clou"
-          + "d.dialogflow.v2beta1.CreateSessionEntity"
-          + "TypeRequest\0322.google.cloud.dialogflow.v2"
-          + "beta1.SessionEntityType\"\260\003\202\323\344\223\002\214\003\"9/v2be"
-          + "ta1/{parent=projects/*/agent/sessions/*}"
-          + "/entityTypes:\023session_entity_typeZg\"P/v2"
-          + "beta1/{parent=projects/*/agent/environme"
-          + "nts/*/users/*/sessions/*}/entityTypes:\023s"
-          + "ession_entity_typeZ\\\"E/v2beta1/{parent=p"
-          + "rojects/*/locations/*/agent/sessions/*}/"
-          + "entityTypes:\023session_entity_typeZs\"\\/v2b"
-          + "eta1/{parent=projects/*/locations/*/agen"
-          + "t/environments/*/users/*/sessions/*}/ent"
-          + "ityTypes:\023session_entity_type\332A\032parent,s"
-          + "ession_entity_type\022\255\005\n\027UpdateSessionEnti"
-          + "tyType\022?.google.cloud.dialogflow.v2beta1"
-          + ".UpdateSessionEntityTypeRequest\0322.google"
-          + ".cloud.dialogflow.v2beta1.SessionEntityT"
-          + "ype\"\234\004\202\323\344\223\002\335\0032M/v2beta1/{session_entity_"
-          + "type.name=projects/*/agent/sessions/*/en"
-          + "tityTypes/*}:\023session_entity_typeZ{2d/v2"
-          + "beta1/{session_entity_type.name=projects"
-          + "/*/agent/environments/*/users/*/sessions"
-          + "/*/entityTypes/*}:\023session_entity_typeZp"
-          + "2Y/v2beta1/{session_entity_type.name=pro"
-          + "jects/*/locations/*/agent/sessions/*/ent"
-          + "ityTypes/*}:\023session_entity_typeZ\207\0012p/v2"
-          + "beta1/{session_entity_type.name=projects"
-          + "/*/locations/*/agent/environments/*/user"
-          + "s/*/sessions/*/entityTypes/*}:\023session_e"
-          + "ntity_type\332A\023session_entity_type\332A\037sessi"
-          + "on_entity_type,update_mask\022\273\003\n\027DeleteSes"
-          + "sionEntityType\022?.google.cloud.dialogflow"
-          + ".v2beta1.DeleteSessionEntityTypeRequest\032"
-          + "\026.google.protobuf.Empty\"\306\002\202\323\344\223\002\270\002*9/v2be"
-          + "ta1/{name=projects/*/agent/sessions/*/en"
-          + "tityTypes/*}ZR*P/v2beta1/{name=projects/"
-          + "*/agent/environments/*/users/*/sessions/"
-          + "*/entityTypes/*}ZG*E/v2beta1/{name=proje"
-          + "cts/*/locations/*/agent/sessions/*/entit"
-          + "yTypes/*}Z^*\\/v2beta1/{name=projects/*/l"
-          + "ocations/*/agent/environments/*/users/*/"
-          + "sessions/*/entityTypes/*}\332A\004name\032x\312A\031dia"
-          + "logflow.googleapis.com\322AYhttps://www.goo"
-          + "gleapis.com/auth/cloud-platform,https://"
-          + "www.googleapis.com/auth/dialogflowB\264\001\n#c"
-          + "om.google.cloud.dialogflow.v2beta1B\026Sess"
-          + "ionEntityTypeProtoP\001ZIgoogle.golang.org/"
-          + "genproto/googleapis/cloud/dialogflow/v2b"
-          + "eta1;dialogflow\370\001\001\242\002\002DF\252\002\037Google.Cloud.D"
-          + "ialogflow.V2beta1b\006proto3"
+          + "alogflow.v2beta1.SessionEntityTypeB\003\340A\002\""
+          + "\247\001\n\036UpdateSessionEntityTypeRequest\022T\n\023se"
+          + "ssion_entity_type\030\001 \001(\01322.google.cloud.d"
+          + "ialogflow.v2beta1.SessionEntityTypeB\003\340A\002"
+          + "\022/\n\013update_mask\030\002 \001(\0132\032.google.protobuf."
+          + "FieldMask\"c\n\036DeleteSessionEntityTypeRequ"
+          + "est\022A\n\004name\030\001 \001(\tB3\340A\002\372A-\n+dialogflow.go"
+          + "ogleapis.com/SessionEntityType2\373\025\n\022Sessi"
+          + "onEntityTypes\022\344\003\n\026ListSessionEntityTypes"
+          + "\022>.google.cloud.dialogflow.v2beta1.ListS"
+          + "essionEntityTypesRequest\032?.google.cloud."
+          + "dialogflow.v2beta1.ListSessionEntityType"
+          + "sResponse\"\310\002\202\323\344\223\002\270\002\0229/v2beta1/{parent=pr"
+          + "ojects/*/agent/sessions/*}/entityTypesZR"
+          + "\022P/v2beta1/{parent=projects/*/agent/envi"
+          + "ronments/*/users/*/sessions/*}/entityTyp"
+          + "esZG\022E/v2beta1/{parent=projects/*/locati"
+          + "ons/*/agent/sessions/*}/entityTypesZ^\022\\/"
+          + "v2beta1/{parent=projects/*/locations/*/a"
+          + "gent/environments/*/users/*/sessions/*}/"
+          + "entityTypes\332A\006parent\022\321\003\n\024GetSessionEntit"
+          + "yType\022<.google.cloud.dialogflow.v2beta1."
+          + "GetSessionEntityTypeRequest\0322.google.clo"
+          + "ud.dialogflow.v2beta1.SessionEntityType\""
+          + "\306\002\202\323\344\223\002\270\002\0229/v2beta1/{name=projects/*/age"
+          + "nt/sessions/*/entityTypes/*}ZR\022P/v2beta1"
+          + "/{name=projects/*/agent/environments/*/u"
+          + "sers/*/sessions/*/entityTypes/*}ZG\022E/v2b"
+          + "eta1/{name=projects/*/locations/*/agent/"
+          + "sessions/*/entityTypes/*}Z^\022\\/v2beta1/{n"
+          + "ame=projects/*/locations/*/agent/environ"
+          + "ments/*/users/*/sessions/*/entityTypes/*"
+          + "}\332A\004name\022\301\004\n\027CreateSessionEntityType\022?.g"
+          + "oogle.cloud.dialogflow.v2beta1.CreateSes"
+          + "sionEntityTypeRequest\0322.google.cloud.dia"
+          + "logflow.v2beta1.SessionEntityType\"\260\003\202\323\344\223"
+          + "\002\214\003\"9/v2beta1/{parent=projects/*/agent/s"
+          + "essions/*}/entityTypes:\023session_entity_t"
+          + "ypeZg\"P/v2beta1/{parent=projects/*/agent"
+          + "/environments/*/users/*/sessions/*}/enti"
+          + "tyTypes:\023session_entity_typeZ\\\"E/v2beta1"
+          + "/{parent=projects/*/locations/*/agent/se"
+          + "ssions/*}/entityTypes:\023session_entity_ty"
+          + "peZs\"\\/v2beta1/{parent=projects/*/locati"
+          + "ons/*/agent/environments/*/users/*/sessi"
+          + "ons/*}/entityTypes:\023session_entity_type\332"
+          + "A\032parent,session_entity_type\022\255\005\n\027UpdateS"
+          + "essionEntityType\022?.google.cloud.dialogfl"
+          + "ow.v2beta1.UpdateSessionEntityTypeReques"
+          + "t\0322.google.cloud.dialogflow.v2beta1.Sess"
+          + "ionEntityType\"\234\004\202\323\344\223\002\335\0032M/v2beta1/{sessi"
+          + "on_entity_type.name=projects/*/agent/ses"
+          + "sions/*/entityTypes/*}:\023session_entity_t"
+          + "ypeZ{2d/v2beta1/{session_entity_type.nam"
+          + "e=projects/*/agent/environments/*/users/"
+          + "*/sessions/*/entityTypes/*}:\023session_ent"
+          + "ity_typeZp2Y/v2beta1/{session_entity_typ"
+          + "e.name=projects/*/locations/*/agent/sess"
+          + "ions/*/entityTypes/*}:\023session_entity_ty"
+          + "peZ\207\0012p/v2beta1/{session_entity_type.nam"
+          + "e=projects/*/locations/*/agent/environme"
+          + "nts/*/users/*/sessions/*/entityTypes/*}:"
+          + "\023session_entity_type\332A\023session_entity_ty"
+          + "pe\332A\037session_entity_type,update_mask\022\273\003\n"
+          + "\027DeleteSessionEntityType\022?.google.cloud."
+          + "dialogflow.v2beta1.DeleteSessionEntityTy"
+          + "peRequest\032\026.google.protobuf.Empty\"\306\002\202\323\344\223"
+          + "\002\270\002*9/v2beta1/{name=projects/*/agent/ses"
+          + "sions/*/entityTypes/*}ZR*P/v2beta1/{name"
+          + "=projects/*/agent/environments/*/users/*"
+          + "/sessions/*/entityTypes/*}ZG*E/v2beta1/{"
+          + "name=projects/*/locations/*/agent/sessio"
+          + "ns/*/entityTypes/*}Z^*\\/v2beta1/{name=pr"
+          + "ojects/*/locations/*/agent/environments/"
+          + "*/users/*/sessions/*/entityTypes/*}\332A\004na"
+          + "me\032x\312A\031dialogflow.googleapis.com\322AYhttps"
+          + "://www.googleapis.com/auth/cloud-platfor"
+          + "m,https://www.googleapis.com/auth/dialog"
+          + "flowB\264\001\n#com.google.cloud.dialogflow.v2b"
+          + "eta1B\026SessionEntityTypeProtoP\001ZIgoogle.g"
+          + "olang.org/genproto/googleapis/cloud/dial"
+          + "ogflow/v2beta1;dialogflow\370\001\001\242\002\002DF\252\002\037Goog"
+          + "le.Cloud.Dialogflow.V2beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionName.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionName.java
index b63661d07..9012a7ec5 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionName.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionName.java
@@ -16,25 +16,42 @@
 
 package com.google.cloud.dialogflow.v2beta1;
 
+import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
+import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /** AUTO-GENERATED DOCUMENTATION AND CLASS */
 @javax.annotation.Generated("by GAPIC protoc plugin")
 public class SessionName implements ResourceName {
 
-  private static final PathTemplate PATH_TEMPLATE =
+  @Deprecated
+  protected SessionName() {}
+
+  private static final PathTemplate PROJECT_SESSION_PATH_TEMPLATE =
       PathTemplate.createWithoutUrlEncoding("projects/{project}/agent/sessions/{session}");
+  private static final PathTemplate PROJECT_ENVIRONMENT_USER_SESSION_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/agent/environments/{environment}/users/{user}/sessions/{session}");
+  private static final PathTemplate PROJECT_LOCATION_SESSION_PATH_TEMPLATE =
+      PathTemplate.createWithoutUrlEncoding(
+          "projects/{project}/locations/{location}/agent/sessions/{session}");
 
   private volatile Map<String, String> fieldValuesMap;
+  private PathTemplate pathTemplate;
+  private String fixedValue;
 
-  private final String project;
-  private final String session;
+  private String project;
+  private String session;
+  private String environment;
+  private String user;
+  private String location;
 
   public String getProject() {
     return project;
@@ -44,35 +61,145 @@ public String getSession() {
     return session;
   }
 
-  public static Builder newBuilder() {
-    return new Builder();
+  public String getEnvironment() {
+    return environment;
   }
 
-  public Builder toBuilder() {
-    return new Builder(this);
+  public String getUser() {
+    return user;
+  }
+
+  public String getLocation() {
+    return location;
   }
 
   private SessionName(Builder builder) {
     project = Preconditions.checkNotNull(builder.getProject());
     session = Preconditions.checkNotNull(builder.getSession());
+    pathTemplate = PROJECT_SESSION_PATH_TEMPLATE;
+  }
+
+  private SessionName(ProjectEnvironmentUserSessionBuilder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    environment = Preconditions.checkNotNull(builder.getEnvironment());
+    user = Preconditions.checkNotNull(builder.getUser());
+    session = Preconditions.checkNotNull(builder.getSession());
+    pathTemplate = PROJECT_ENVIRONMENT_USER_SESSION_PATH_TEMPLATE;
+  }
+
+  private SessionName(ProjectLocationSessionBuilder builder) {
+    project = Preconditions.checkNotNull(builder.getProject());
+    location = Preconditions.checkNotNull(builder.getLocation());
+    session = Preconditions.checkNotNull(builder.getSession());
+    pathTemplate = PROJECT_LOCATION_SESSION_PATH_TEMPLATE;
+  }
+
+  public static Builder newBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static Builder newProjectSessionBuilder() {
+    return new Builder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static ProjectEnvironmentUserSessionBuilder newProjectEnvironmentUserSessionBuilder() {
+    return new ProjectEnvironmentUserSessionBuilder();
+  }
+
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static ProjectLocationSessionBuilder newProjectLocationSessionBuilder() {
+    return new ProjectLocationSessionBuilder();
+  }
+
+  public Builder toBuilder() {
+    return new Builder(this);
   }
 
   public static SessionName of(String project, String session) {
-    return newBuilder().setProject(project).setSession(session).build();
+    return newProjectSessionBuilder().setProject(project).setSession(session).build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static SessionName ofProjectSessionName(String project, String session) {
+    return newProjectSessionBuilder().setProject(project).setSession(session).build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static SessionName ofProjectEnvironmentUserSessionName(
+      String project, String environment, String user, String session) {
+    return newProjectEnvironmentUserSessionBuilder()
+        .setProject(project)
+        .setEnvironment(environment)
+        .setUser(user)
+        .setSession(session)
+        .build();
+  }
+
+  @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static SessionName ofProjectLocationSessionName(
+      String project, String location, String session) {
+    return newProjectLocationSessionBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setSession(session)
+        .build();
   }
 
   public static String format(String project, String session) {
     return newBuilder().setProject(project).setSession(session).build().toString();
   }
 
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectSessionName(String project, String session) {
+    return newBuilder().setProject(project).setSession(session).build().toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectEnvironmentUserSessionName(
+      String project, String environment, String user, String session) {
+    return newProjectEnvironmentUserSessionBuilder()
+        .setProject(project)
+        .setEnvironment(environment)
+        .setUser(user)
+        .setSession(session)
+        .build()
+        .toString();
+  }
+
+  @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectLocationSessionName(
+      String project, String location, String session) {
+    return newProjectLocationSessionBuilder()
+        .setProject(project)
+        .setLocation(location)
+        .setSession(session)
+        .build()
+        .toString();
+  }
+
   public static SessionName parse(String formattedString) {
     if (formattedString.isEmpty()) {
       return null;
     }
-    Map<String, String> matchMap =
-        PATH_TEMPLATE.validatedMatch(
-            formattedString, "SessionName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("session"));
+    if (PROJECT_SESSION_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap = PROJECT_SESSION_PATH_TEMPLATE.match(formattedString);
+      return ofProjectSessionName(matchMap.get("project"), matchMap.get("session"));
+    } else if (PROJECT_ENVIRONMENT_USER_SESSION_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap =
+          PROJECT_ENVIRONMENT_USER_SESSION_PATH_TEMPLATE.match(formattedString);
+      return ofProjectEnvironmentUserSessionName(
+          matchMap.get("project"),
+          matchMap.get("environment"),
+          matchMap.get("user"),
+          matchMap.get("session"));
+    } else if (PROJECT_LOCATION_SESSION_PATH_TEMPLATE.matches(formattedString)) {
+      Map<String, String> matchMap = PROJECT_LOCATION_SESSION_PATH_TEMPLATE.match(formattedString);
+      return ofProjectLocationSessionName(
+          matchMap.get("project"), matchMap.get("location"), matchMap.get("session"));
+    }
+    throw new ValidationException("JobName.parse: formattedString not in valid format");
   }
 
   public static List<SessionName> parseList(List<String> formattedStrings) {
@@ -84,7 +211,7 @@ public static List<SessionName> parseList(List<String> formattedStrings) {
   }
 
   public static List<String> toStringList(List<SessionName> values) {
-    List<String> list = new ArrayList<String>(values.size());
+    List<String> list = new ArrayList<>(values.size());
     for (SessionName value : values) {
       if (value == null) {
         list.add("");
@@ -96,16 +223,32 @@ public static List<String> toStringList(List<SessionName> values) {
   }
 
   public static boolean isParsableFrom(String formattedString) {
-    return PATH_TEMPLATE.matches(formattedString);
+    return PROJECT_SESSION_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_ENVIRONMENT_USER_SESSION_PATH_TEMPLATE.matches(formattedString)
+        || PROJECT_LOCATION_SESSION_PATH_TEMPLATE.matches(formattedString);
   }
 
+  @Override
   public Map<String, String> getFieldValuesMap() {
     if (fieldValuesMap == null) {
       synchronized (this) {
         if (fieldValuesMap == null) {
           ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          fieldMapBuilder.put("project", project);
-          fieldMapBuilder.put("session", session);
+          if (project != null) {
+            fieldMapBuilder.put("project", project);
+          }
+          if (session != null) {
+            fieldMapBuilder.put("session", session);
+          }
+          if (environment != null) {
+            fieldMapBuilder.put("environment", environment);
+          }
+          if (user != null) {
+            fieldMapBuilder.put("user", user);
+          }
+          if (location != null) {
+            fieldMapBuilder.put("location", location);
+          }
           fieldValuesMap = fieldMapBuilder.build();
         }
       }
@@ -119,15 +262,17 @@ public String getFieldValue(String fieldName) {
 
   @Override
   public String toString() {
-    return PATH_TEMPLATE.instantiate("project", project, "session", session);
+    return fixedValue != null ? fixedValue : pathTemplate.instantiate(getFieldValuesMap());
   }
 
-  /** Builder for SessionName. */
+  /** Builder for projects/{project}/agent/sessions/{session}. */
   public static class Builder {
 
     private String project;
     private String session;
 
+    protected Builder() {}
+
     public String getProject() {
       return project;
     }
@@ -146,9 +291,11 @@ public Builder setSession(String session) {
       return this;
     }
 
-    private Builder() {}
-
     private Builder(SessionName sessionName) {
+      Preconditions.checkArgument(
+          sessionName.pathTemplate == PROJECT_SESSION_PATH_TEMPLATE,
+          "toBuilder is only supported when SessionName has the pattern of "
+              + "projects/{project}/agent/sessions/{session}.");
       project = sessionName.project;
       session = sessionName.session;
     }
@@ -158,14 +305,115 @@ public SessionName build() {
     }
   }
 
+  /**
+   * Builder for
+   * projects/{project}/agent/environments/{environment}/users/{user}/sessions/{session}.
+   */
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static class ProjectEnvironmentUserSessionBuilder {
+
+    private String project;
+    private String environment;
+    private String user;
+    private String session;
+
+    private ProjectEnvironmentUserSessionBuilder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getEnvironment() {
+      return environment;
+    }
+
+    public String getUser() {
+      return user;
+    }
+
+    public String getSession() {
+      return session;
+    }
+
+    public ProjectEnvironmentUserSessionBuilder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionBuilder setEnvironment(String environment) {
+      this.environment = environment;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionBuilder setUser(String user) {
+      this.user = user;
+      return this;
+    }
+
+    public ProjectEnvironmentUserSessionBuilder setSession(String session) {
+      this.session = session;
+      return this;
+    }
+
+    public SessionName build() {
+      return new SessionName(this);
+    }
+  }
+
+  /** Builder for projects/{project}/locations/{location}/agent/sessions/{session}. */
+  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static class ProjectLocationSessionBuilder {
+
+    private String project;
+    private String location;
+    private String session;
+
+    private ProjectLocationSessionBuilder() {}
+
+    public String getProject() {
+      return project;
+    }
+
+    public String getLocation() {
+      return location;
+    }
+
+    public String getSession() {
+      return session;
+    }
+
+    public ProjectLocationSessionBuilder setProject(String project) {
+      this.project = project;
+      return this;
+    }
+
+    public ProjectLocationSessionBuilder setLocation(String location) {
+      this.location = location;
+      return this;
+    }
+
+    public ProjectLocationSessionBuilder setSession(String session) {
+      this.session = session;
+      return this;
+    }
+
+    public SessionName build() {
+      return new SessionName(this);
+    }
+  }
+
   @Override
   public boolean equals(Object o) {
     if (o == this) {
       return true;
     }
-    if (o instanceof SessionName) {
+    if (o != null || getClass() == o.getClass()) {
       SessionName that = (SessionName) o;
-      return (this.project.equals(that.project)) && (this.session.equals(that.session));
+      return (Objects.equals(this.project, that.project))
+          && (Objects.equals(this.session, that.session))
+          && (Objects.equals(this.environment, that.environment))
+          && (Objects.equals(this.user, that.user))
+          && (Objects.equals(this.location, that.location));
     }
     return false;
   }
@@ -174,9 +422,17 @@ public boolean equals(Object o) {
   public int hashCode() {
     int h = 1;
     h *= 1000003;
-    h ^= project.hashCode();
+    h ^= Objects.hashCode(fixedValue);
+    h *= 1000003;
+    h ^= Objects.hashCode(project);
+    h *= 1000003;
+    h ^= Objects.hashCode(session);
+    h *= 1000003;
+    h ^= Objects.hashCode(environment);
+    h *= 1000003;
+    h ^= Objects.hashCode(user);
     h *= 1000003;
-    h ^= session.hashCode();
+    h ^= Objects.hashCode(location);
     return h;
   }
 }
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java
index 96b81a4c1..1e2b92f63 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SessionProto.java
@@ -114,147 +114,147 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "roto\032\036google/protobuf/duration.proto\032 go"
           + "ogle/protobuf/field_mask.proto\032\034google/p"
           + "rotobuf/struct.proto\032\027google/rpc/status."
-          + "proto\032\030google/type/latlng.proto\"\374\002\n\023Dete"
-          + "ctIntentRequest\0227\n\007session\030\001 \001(\tB&\372A#\n!d"
-          + "ialogflow.googleapis.com/Session\022F\n\014quer"
+          + "proto\032\030google/type/latlng.proto\"\204\003\n\023Dete"
+          + "ctIntentRequest\022:\n\007session\030\001 \001(\tB)\340A\002\372A#"
+          + "\n!dialogflow.googleapis.com/Session\022F\n\014q"
+          + "uery_params\030\002 \001(\01320.google.cloud.dialogf"
+          + "low.v2beta1.QueryParameters\022E\n\013query_inp"
+          + "ut\030\003 \001(\0132+.google.cloud.dialogflow.v2bet"
+          + "a1.QueryInputB\003\340A\002\022O\n\023output_audio_confi"
+          + "g\030\004 \001(\01322.google.cloud.dialogflow.v2beta"
+          + "1.OutputAudioConfig\022<\n\030output_audio_conf"
+          + "ig_mask\030\007 \001(\0132\032.google.protobuf.FieldMas"
+          + "k\022\023\n\013input_audio\030\005 \001(\014\"\323\002\n\024DetectIntentR"
+          + "esponse\022\023\n\013response_id\030\001 \001(\t\022B\n\014query_re"
+          + "sult\030\002 \001(\0132,.google.cloud.dialogflow.v2b"
+          + "eta1.QueryResult\022O\n\031alternative_query_re"
+          + "sults\030\005 \003(\0132,.google.cloud.dialogflow.v2"
+          + "beta1.QueryResult\022*\n\016webhook_status\030\003 \001("
+          + "\0132\022.google.rpc.Status\022\024\n\014output_audio\030\004 "
+          + "\001(\014\022O\n\023output_audio_config\030\006 \001(\01322.googl"
+          + "e.cloud.dialogflow.v2beta1.OutputAudioCo"
+          + "nfig\"\376\004\n\017QueryParameters\022\021\n\ttime_zone\030\001 "
+          + "\001(\t\022)\n\014geo_location\030\002 \001(\0132\023.google.type."
+          + "LatLng\022:\n\010contexts\030\003 \003(\0132(.google.cloud."
+          + "dialogflow.v2beta1.Context\022\026\n\016reset_cont"
+          + "exts\030\004 \001(\010\022P\n\024session_entity_types\030\005 \003(\013"
+          + "22.google.cloud.dialogflow.v2beta1.Sessi"
+          + "onEntityType\022(\n\007payload\030\006 \001(\0132\027.google.p"
+          + "rotobuf.Struct\022\034\n\024knowledge_base_names\030\014"
+          + " \003(\t\022j\n!sentiment_analysis_request_confi"
+          + "g\030\n \001(\0132?.google.cloud.dialogflow.v2beta"
+          + "1.SentimentAnalysisRequestConfig\022=\n\nsub_"
+          + "agents\030\r \003(\0132).google.cloud.dialogflow.v"
+          + "2beta1.SubAgent\022]\n\017webhook_headers\030\016 \003(\013"
+          + "2D.google.cloud.dialogflow.v2beta1.Query"
+          + "Parameters.WebhookHeadersEntry\0325\n\023Webhoo"
+          + "kHeadersEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001("
+          + "\t:\0028\001\"\332\001\n\nQueryInput\022I\n\014audio_config\030\001 \001"
+          + "(\01321.google.cloud.dialogflow.v2beta1.Inp"
+          + "utAudioConfigH\000\022:\n\004text\030\002 \001(\0132*.google.c"
+          + "loud.dialogflow.v2beta1.TextInputH\000\022<\n\005e"
+          + "vent\030\003 \001(\0132+.google.cloud.dialogflow.v2b"
+          + "eta1.EventInputH\000B\007\n\005input\"\362\005\n\013QueryResu"
+          + "lt\022\022\n\nquery_text\030\001 \001(\t\022\025\n\rlanguage_code\030"
+          + "\017 \001(\t\022%\n\035speech_recognition_confidence\030\002"
+          + " \001(\002\022\016\n\006action\030\003 \001(\t\022+\n\nparameters\030\004 \001(\013"
+          + "2\027.google.protobuf.Struct\022#\n\033all_require"
+          + "d_params_present\030\005 \001(\010\022\030\n\020fulfillment_te"
+          + "xt\030\006 \001(\t\022M\n\024fulfillment_messages\030\007 \003(\0132/"
+          + ".google.cloud.dialogflow.v2beta1.Intent."
+          + "Message\022\026\n\016webhook_source\030\010 \001(\t\0220\n\017webho"
+          + "ok_payload\030\t \001(\0132\027.google.protobuf.Struc"
+          + "t\022A\n\017output_contexts\030\n \003(\0132(.google.clou"
+          + "d.dialogflow.v2beta1.Context\0227\n\006intent\030\013"
+          + " \001(\0132\'.google.cloud.dialogflow.v2beta1.I"
+          + "ntent\022#\n\033intent_detection_confidence\030\014 \001"
+          + "(\002\0220\n\017diagnostic_info\030\016 \001(\0132\027.google.pro"
+          + "tobuf.Struct\022[\n\031sentiment_analysis_resul"
+          + "t\030\021 \001(\01328.google.cloud.dialogflow.v2beta"
+          + "1.SentimentAnalysisResult\022L\n\021knowledge_a"
+          + "nswers\030\022 \001(\01321.google.cloud.dialogflow.v"
+          + "2beta1.KnowledgeAnswers\"\257\003\n\020KnowledgeAns"
+          + "wers\022I\n\007answers\030\001 \003(\01328.google.cloud.dia"
+          + "logflow.v2beta1.KnowledgeAnswers.Answer\032"
+          + "\317\002\n\006Answer\0227\n\006source\030\001 \001(\tB\'\372A$\n\"dialogf"
+          + "low.googleapis.com/Document\022\024\n\014faq_quest"
+          + "ion\030\002 \001(\t\022\016\n\006answer\030\003 \001(\t\022m\n\026match_confi"
+          + "dence_level\030\004 \001(\0162M.google.cloud.dialogf"
+          + "low.v2beta1.KnowledgeAnswers.Answer.Matc"
+          + "hConfidenceLevel\022\030\n\020match_confidence\030\005 \001"
+          + "(\002\"]\n\024MatchConfidenceLevel\022&\n\"MATCH_CONF"
+          + "IDENCE_LEVEL_UNSPECIFIED\020\000\022\007\n\003LOW\020\001\022\n\n\006M"
+          + "EDIUM\020\002\022\010\n\004HIGH\020\003\"\201\003\n\034StreamingDetectInt"
+          + "entRequest\022\024\n\007session\030\001 \001(\tB\003\340A\002\022F\n\014quer"
           + "y_params\030\002 \001(\01320.google.cloud.dialogflow"
-          + ".v2beta1.QueryParameters\022@\n\013query_input\030"
+          + ".v2beta1.QueryParameters\022E\n\013query_input\030"
           + "\003 \001(\0132+.google.cloud.dialogflow.v2beta1."
-          + "QueryInput\022O\n\023output_audio_config\030\004 \001(\0132"
-          + "2.google.cloud.dialogflow.v2beta1.Output"
-          + "AudioConfig\022<\n\030output_audio_config_mask\030"
-          + "\007 \001(\0132\032.google.protobuf.FieldMask\022\023\n\013inp"
-          + "ut_audio\030\005 \001(\014\"\323\002\n\024DetectIntentResponse\022"
-          + "\023\n\013response_id\030\001 \001(\t\022B\n\014query_result\030\002 \001"
-          + "(\0132,.google.cloud.dialogflow.v2beta1.Que"
-          + "ryResult\022O\n\031alternative_query_results\030\005 "
-          + "\003(\0132,.google.cloud.dialogflow.v2beta1.Qu"
-          + "eryResult\022*\n\016webhook_status\030\003 \001(\0132\022.goog"
-          + "le.rpc.Status\022\024\n\014output_audio\030\004 \001(\014\022O\n\023o"
-          + "utput_audio_config\030\006 \001(\01322.google.cloud."
-          + "dialogflow.v2beta1.OutputAudioConfig\"\376\004\n"
-          + "\017QueryParameters\022\021\n\ttime_zone\030\001 \001(\t\022)\n\014g"
-          + "eo_location\030\002 \001(\0132\023.google.type.LatLng\022:"
-          + "\n\010contexts\030\003 \003(\0132(.google.cloud.dialogfl"
-          + "ow.v2beta1.Context\022\026\n\016reset_contexts\030\004 \001"
-          + "(\010\022P\n\024session_entity_types\030\005 \003(\01322.googl"
-          + "e.cloud.dialogflow.v2beta1.SessionEntity"
-          + "Type\022(\n\007payload\030\006 \001(\0132\027.google.protobuf."
-          + "Struct\022\034\n\024knowledge_base_names\030\014 \003(\t\022j\n!"
-          + "sentiment_analysis_request_config\030\n \001(\0132"
-          + "?.google.cloud.dialogflow.v2beta1.Sentim"
-          + "entAnalysisRequestConfig\022=\n\nsub_agents\030\r"
-          + " \003(\0132).google.cloud.dialogflow.v2beta1.S"
-          + "ubAgent\022]\n\017webhook_headers\030\016 \003(\0132D.googl"
-          + "e.cloud.dialogflow.v2beta1.QueryParamete"
-          + "rs.WebhookHeadersEntry\0325\n\023WebhookHeaders"
-          + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\332\001"
-          + "\n\nQueryInput\022I\n\014audio_config\030\001 \001(\01321.goo"
-          + "gle.cloud.dialogflow.v2beta1.InputAudioC"
-          + "onfigH\000\022:\n\004text\030\002 \001(\0132*.google.cloud.dia"
-          + "logflow.v2beta1.TextInputH\000\022<\n\005event\030\003 \001"
-          + "(\0132+.google.cloud.dialogflow.v2beta1.Eve"
-          + "ntInputH\000B\007\n\005input\"\362\005\n\013QueryResult\022\022\n\nqu"
-          + "ery_text\030\001 \001(\t\022\025\n\rlanguage_code\030\017 \001(\t\022%\n"
-          + "\035speech_recognition_confidence\030\002 \001(\002\022\016\n\006"
-          + "action\030\003 \001(\t\022+\n\nparameters\030\004 \001(\0132\027.googl"
-          + "e.protobuf.Struct\022#\n\033all_required_params"
-          + "_present\030\005 \001(\010\022\030\n\020fulfillment_text\030\006 \001(\t"
-          + "\022M\n\024fulfillment_messages\030\007 \003(\0132/.google."
-          + "cloud.dialogflow.v2beta1.Intent.Message\022"
-          + "\026\n\016webhook_source\030\010 \001(\t\0220\n\017webhook_paylo"
-          + "ad\030\t \001(\0132\027.google.protobuf.Struct\022A\n\017out"
-          + "put_contexts\030\n \003(\0132(.google.cloud.dialog"
-          + "flow.v2beta1.Context\0227\n\006intent\030\013 \001(\0132\'.g"
-          + "oogle.cloud.dialogflow.v2beta1.Intent\022#\n"
-          + "\033intent_detection_confidence\030\014 \001(\002\0220\n\017di"
-          + "agnostic_info\030\016 \001(\0132\027.google.protobuf.St"
-          + "ruct\022[\n\031sentiment_analysis_result\030\021 \001(\0132"
-          + "8.google.cloud.dialogflow.v2beta1.Sentim"
-          + "entAnalysisResult\022L\n\021knowledge_answers\030\022"
-          + " \001(\01321.google.cloud.dialogflow.v2beta1.K"
-          + "nowledgeAnswers\"\257\003\n\020KnowledgeAnswers\022I\n\007"
-          + "answers\030\001 \003(\01328.google.cloud.dialogflow."
-          + "v2beta1.KnowledgeAnswers.Answer\032\317\002\n\006Answ"
-          + "er\0227\n\006source\030\001 \001(\tB\'\372A$\n\"dialogflow.goog"
-          + "leapis.com/Document\022\024\n\014faq_question\030\002 \001("
-          + "\t\022\016\n\006answer\030\003 \001(\t\022m\n\026match_confidence_le"
-          + "vel\030\004 \001(\0162M.google.cloud.dialogflow.v2be"
-          + "ta1.KnowledgeAnswers.Answer.MatchConfide"
-          + "nceLevel\022\030\n\020match_confidence\030\005 \001(\002\"]\n\024Ma"
-          + "tchConfidenceLevel\022&\n\"MATCH_CONFIDENCE_L"
-          + "EVEL_UNSPECIFIED\020\000\022\007\n\003LOW\020\001\022\n\n\006MEDIUM\020\002\022"
-          + "\010\n\004HIGH\020\003\"\367\002\n\034StreamingDetectIntentReque"
-          + "st\022\017\n\007session\030\001 \001(\t\022F\n\014query_params\030\002 \001("
-          + "\01320.google.cloud.dialogflow.v2beta1.Quer"
-          + "yParameters\022@\n\013query_input\030\003 \001(\0132+.googl"
-          + "e.cloud.dialogflow.v2beta1.QueryInput\022\030\n"
-          + "\020single_utterance\030\004 \001(\010\022O\n\023output_audio_"
-          + "config\030\005 \001(\01322.google.cloud.dialogflow.v"
-          + "2beta1.OutputAudioConfig\022<\n\030output_audio"
-          + "_config_mask\030\007 \001(\0132\032.google.protobuf.Fie"
-          + "ldMask\022\023\n\013input_audio\030\006 \001(\014\"\265\003\n\035Streamin"
-          + "gDetectIntentResponse\022\023\n\013response_id\030\001 \001"
-          + "(\t\022W\n\022recognition_result\030\002 \001(\0132;.google."
-          + "cloud.dialogflow.v2beta1.StreamingRecogn"
-          + "itionResult\022B\n\014query_result\030\003 \001(\0132,.goog"
-          + "le.cloud.dialogflow.v2beta1.QueryResult\022"
-          + "O\n\031alternative_query_results\030\007 \003(\0132,.goo"
-          + "gle.cloud.dialogflow.v2beta1.QueryResult"
-          + "\022*\n\016webhook_status\030\004 \001(\0132\022.google.rpc.St"
-          + "atus\022\024\n\014output_audio\030\005 \001(\014\022O\n\023output_aud"
-          + "io_config\030\006 \001(\01322.google.cloud.dialogflo"
-          + "w.v2beta1.OutputAudioConfig\"\243\003\n\032Streamin"
-          + "gRecognitionResult\022]\n\014message_type\030\001 \001(\016"
-          + "2G.google.cloud.dialogflow.v2beta1.Strea"
-          + "mingRecognitionResult.MessageType\022\022\n\ntra"
-          + "nscript\030\002 \001(\t\022\020\n\010is_final\030\003 \001(\010\022\022\n\nconfi"
-          + "dence\030\004 \001(\002\022\021\n\tstability\030\006 \001(\002\022I\n\020speech"
-          + "_word_info\030\007 \003(\0132/.google.cloud.dialogfl"
-          + "ow.v2beta1.SpeechWordInfo\0224\n\021speech_end_"
-          + "offset\030\010 \001(\0132\031.google.protobuf.Duration\""
-          + "X\n\013MessageType\022\034\n\030MESSAGE_TYPE_UNSPECIFI"
-          + "ED\020\000\022\016\n\nTRANSCRIPT\020\001\022\033\n\027END_OF_SINGLE_UT"
-          + "TERANCE\020\002\"0\n\tTextInput\022\014\n\004text\030\001 \001(\t\022\025\n\r"
-          + "language_code\030\002 \001(\t\"^\n\nEventInput\022\014\n\004nam"
-          + "e\030\001 \001(\t\022+\n\nparameters\030\002 \001(\0132\027.google.pro"
-          + "tobuf.Struct\022\025\n\rlanguage_code\030\003 \001(\t\"F\n\036S"
-          + "entimentAnalysisRequestConfig\022$\n\034analyze"
-          + "_query_text_sentiment\030\001 \001(\010\"c\n\027Sentiment"
-          + "AnalysisResult\022H\n\024query_text_sentiment\030\001"
-          + " \001(\0132*.google.cloud.dialogflow.v2beta1.S"
-          + "entiment\"-\n\tSentiment\022\r\n\005score\030\001 \001(\002\022\021\n\t"
-          + "magnitude\030\002 \001(\0022\215\006\n\010Sessions\022\347\003\n\014DetectI"
-          + "ntent\0224.google.cloud.dialogflow.v2beta1."
-          + "DetectIntentRequest\0325.google.cloud.dialo"
-          + "gflow.v2beta1.DetectIntentResponse\"\351\002\202\323\344"
-          + "\223\002\314\002\";/v2beta1/{session=projects/*/agent"
-          + "/sessions/*}:detectIntent:\001*ZW\"R/v2beta1"
-          + "/{session=projects/*/agent/environments/"
-          + "*/users/*/sessions/*}:detectIntent:\001*ZL\""
-          + "G/v2beta1/{session=projects/*/locations/"
-          + "*/agent/sessions/*}:detectIntent:\001*Zc\"^/"
-          + "v2beta1/{session=projects/*/locations/*/"
-          + "agent/environments/*/users/*/sessions/*}"
-          + ":detectIntent:\001*\332A\023session,query_input\022\234"
-          + "\001\n\025StreamingDetectIntent\022=.google.cloud."
-          + "dialogflow.v2beta1.StreamingDetectIntent"
-          + "Request\032>.google.cloud.dialogflow.v2beta"
-          + "1.StreamingDetectIntentResponse\"\000(\0010\001\032x\312"
-          + "A\031dialogflow.googleapis.com\322AYhttps://ww"
-          + "w.googleapis.com/auth/cloud-platform,htt"
-          + "ps://www.googleapis.com/auth/dialogflowB"
-          + "\225\003\n#com.google.cloud.dialogflow.v2beta1B"
-          + "\014SessionProtoP\001ZIgoogle.golang.org/genpr"
-          + "oto/googleapis/cloud/dialogflow/v2beta1;"
-          + "dialogflow\370\001\001\242\002\002DF\252\002\037Google.Cloud.Dialog"
-          + "flow.V2beta1\352A\347\001\n!dialogflow.googleapis."
-          + "com/Session\022+projects/{project}/agent/se"
-          + "ssions/{session}\022Sprojects/{project}/age"
-          + "nt/environments/{environment}/users/{use"
-          + "r}/sessions/{session}\022@projects/{project"
-          + "}/locations/{location}/agent/sessions/{s"
-          + "ession}b\006proto3"
+          + "QueryInputB\003\340A\002\022\030\n\020single_utterance\030\004 \001("
+          + "\010\022O\n\023output_audio_config\030\005 \001(\01322.google."
+          + "cloud.dialogflow.v2beta1.OutputAudioConf"
+          + "ig\022<\n\030output_audio_config_mask\030\007 \001(\0132\032.g"
+          + "oogle.protobuf.FieldMask\022\023\n\013input_audio\030"
+          + "\006 \001(\014\"\265\003\n\035StreamingDetectIntentResponse\022"
+          + "\023\n\013response_id\030\001 \001(\t\022W\n\022recognition_resu"
+          + "lt\030\002 \001(\0132;.google.cloud.dialogflow.v2bet"
+          + "a1.StreamingRecognitionResult\022B\n\014query_r"
+          + "esult\030\003 \001(\0132,.google.cloud.dialogflow.v2"
+          + "beta1.QueryResult\022O\n\031alternative_query_r"
+          + "esults\030\007 \003(\0132,.google.cloud.dialogflow.v"
+          + "2beta1.QueryResult\022*\n\016webhook_status\030\004 \001"
+          + "(\0132\022.google.rpc.Status\022\024\n\014output_audio\030\005"
+          + " \001(\014\022O\n\023output_audio_config\030\006 \001(\01322.goog"
+          + "le.cloud.dialogflow.v2beta1.OutputAudioC"
+          + "onfig\"\243\003\n\032StreamingRecognitionResult\022]\n\014"
+          + "message_type\030\001 \001(\0162G.google.cloud.dialog"
+          + "flow.v2beta1.StreamingRecognitionResult."
+          + "MessageType\022\022\n\ntranscript\030\002 \001(\t\022\020\n\010is_fi"
+          + "nal\030\003 \001(\010\022\022\n\nconfidence\030\004 \001(\002\022\021\n\tstabili"
+          + "ty\030\006 \001(\002\022I\n\020speech_word_info\030\007 \003(\0132/.goo"
+          + "gle.cloud.dialogflow.v2beta1.SpeechWordI"
+          + "nfo\0224\n\021speech_end_offset\030\010 \001(\0132\031.google."
+          + "protobuf.Duration\"X\n\013MessageType\022\034\n\030MESS"
+          + "AGE_TYPE_UNSPECIFIED\020\000\022\016\n\nTRANSCRIPT\020\001\022\033"
+          + "\n\027END_OF_SINGLE_UTTERANCE\020\002\"0\n\tTextInput"
+          + "\022\014\n\004text\030\001 \001(\t\022\025\n\rlanguage_code\030\002 \001(\t\"^\n"
+          + "\nEventInput\022\014\n\004name\030\001 \001(\t\022+\n\nparameters\030"
+          + "\002 \001(\0132\027.google.protobuf.Struct\022\025\n\rlangua"
+          + "ge_code\030\003 \001(\t\"F\n\036SentimentAnalysisReques"
+          + "tConfig\022$\n\034analyze_query_text_sentiment\030"
+          + "\001 \001(\010\"c\n\027SentimentAnalysisResult\022H\n\024quer"
+          + "y_text_sentiment\030\001 \001(\0132*.google.cloud.di"
+          + "alogflow.v2beta1.Sentiment\"-\n\tSentiment\022"
+          + "\r\n\005score\030\001 \001(\002\022\021\n\tmagnitude\030\002 \001(\0022\215\006\n\010Se"
+          + "ssions\022\347\003\n\014DetectIntent\0224.google.cloud.d"
+          + "ialogflow.v2beta1.DetectIntentRequest\0325."
+          + "google.cloud.dialogflow.v2beta1.DetectIn"
+          + "tentResponse\"\351\002\202\323\344\223\002\314\002\";/v2beta1/{sessio"
+          + "n=projects/*/agent/sessions/*}:detectInt"
+          + "ent:\001*ZW\"R/v2beta1/{session=projects/*/a"
+          + "gent/environments/*/users/*/sessions/*}:"
+          + "detectIntent:\001*ZL\"G/v2beta1/{session=pro"
+          + "jects/*/locations/*/agent/sessions/*}:de"
+          + "tectIntent:\001*Zc\"^/v2beta1/{session=proje"
+          + "cts/*/locations/*/agent/environments/*/u"
+          + "sers/*/sessions/*}:detectIntent:\001*\332A\023ses"
+          + "sion,query_input\022\234\001\n\025StreamingDetectInte"
+          + "nt\022=.google.cloud.dialogflow.v2beta1.Str"
+          + "eamingDetectIntentRequest\032>.google.cloud"
+          + ".dialogflow.v2beta1.StreamingDetectInten"
+          + "tResponse\"\000(\0010\001\032x\312A\031dialogflow.googleapi"
+          + "s.com\322AYhttps://www.googleapis.com/auth/"
+          + "cloud-platform,https://www.googleapis.co"
+          + "m/auth/dialogflowB\225\003\n#com.google.cloud.d"
+          + "ialogflow.v2beta1B\014SessionProtoP\001ZIgoogl"
+          + "e.golang.org/genproto/googleapis/cloud/d"
+          + "ialogflow/v2beta1;dialogflow\370\001\001\242\002\002DF\252\002\037G"
+          + "oogle.Cloud.Dialogflow.V2beta1\352A\347\001\n!dial"
+          + "ogflow.googleapis.com/Session\022+projects/"
+          + "{project}/agent/sessions/{session}\022Sproj"
+          + "ects/{project}/agent/environments/{envir"
+          + "onment}/users/{user}/sessions/{session}\022"
+          + "@projects/{project}/locations/{location}"
+          + "/agent/sessions/{session}b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -462,6 +462,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
     registry.add(com.google.api.ClientProto.defaultHost);
+    registry.add(com.google.api.FieldBehaviorProto.fieldBehavior);
     registry.add(com.google.api.AnnotationsProto.http);
     registry.add(com.google.api.ClientProto.methodSignature);
     registry.add(com.google.api.ClientProto.oauthScopes);
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequest.java
index bf8ee8da7..42be5e911 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequest.java
@@ -142,7 +142,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Required. The agent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the agent field is set.
    */
@@ -157,7 +159,9 @@ public boolean hasAgent() {
    * Required. The agent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The agent.
    */
@@ -172,7 +176,9 @@ public com.google.cloud.dialogflow.v2beta1.Agent getAgent() {
    * Required. The agent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.AgentOrBuilder getAgentOrBuilder() {
@@ -596,7 +602,9 @@ public Builder mergeFrom(
      * Required. The agent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return Whether the agent field is set.
      */
@@ -610,7 +618,9 @@ public boolean hasAgent() {
      * Required. The agent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return The agent.
      */
@@ -630,7 +640,9 @@ public com.google.cloud.dialogflow.v2beta1.Agent getAgent() {
      * Required. The agent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setAgent(com.google.cloud.dialogflow.v2beta1.Agent value) {
       if (agentBuilder_ == null) {
@@ -652,7 +664,9 @@ public Builder setAgent(com.google.cloud.dialogflow.v2beta1.Agent value) {
      * Required. The agent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setAgent(com.google.cloud.dialogflow.v2beta1.Agent.Builder builderForValue) {
       if (agentBuilder_ == null) {
@@ -671,7 +685,9 @@ public Builder setAgent(com.google.cloud.dialogflow.v2beta1.Agent.Builder builde
      * Required. The agent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder mergeAgent(com.google.cloud.dialogflow.v2beta1.Agent value) {
       if (agentBuilder_ == null) {
@@ -697,7 +713,9 @@ public Builder mergeAgent(com.google.cloud.dialogflow.v2beta1.Agent value) {
      * Required. The agent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder clearAgent() {
       if (agentBuilder_ == null) {
@@ -717,7 +735,9 @@ public Builder clearAgent() {
      * Required. The agent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Agent.Builder getAgentBuilder() {
 
@@ -731,7 +751,9 @@ public com.google.cloud.dialogflow.v2beta1.Agent.Builder getAgentBuilder() {
      * Required. The agent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.AgentOrBuilder getAgentOrBuilder() {
       if (agentBuilder_ != null) {
@@ -749,7 +771,9 @@ public com.google.cloud.dialogflow.v2beta1.AgentOrBuilder getAgentOrBuilder() {
      * Required. The agent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Agent,
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequestOrBuilder.java
index f8a71788e..e1bdada26 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/SetAgentRequestOrBuilder.java
@@ -30,7 +30,9 @@ public interface SetAgentRequestOrBuilder
    * Required. The agent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the agent field is set.
    */
@@ -42,7 +44,9 @@ public interface SetAgentRequestOrBuilder
    * Required. The agent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The agent.
    */
@@ -54,7 +58,9 @@ public interface SetAgentRequestOrBuilder
    * Required. The agent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Agent agent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Agent agent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.AgentOrBuilder getAgentOrBuilder();
 
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java
index a6bfa7a08..0291339d1 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequest.java
@@ -231,7 +231,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
-   * <code>string session = 1;</code>
+   * <code>string session = 1 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @return The session.
    */
@@ -265,7 +265,7 @@ public java.lang.String getSession() {
    * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
-   * <code>string session = 1;</code>
+   * <code>string session = 1 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @return The bytes for session.
    */
@@ -343,7 +343,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryPara
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the queryInput field is set.
    */
@@ -362,7 +364,9 @@ public boolean hasQueryInput() {
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The queryInput.
    */
@@ -383,7 +387,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryInput getQueryInput() {
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBuilder() {
@@ -1060,7 +1066,7 @@ public Builder mergeFrom(
      * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
-     * <code>string session = 1;</code>
+     * <code>string session = 1 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @return The session.
      */
@@ -1093,7 +1099,7 @@ public java.lang.String getSession() {
      * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
-     * <code>string session = 1;</code>
+     * <code>string session = 1 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @return The bytes for session.
      */
@@ -1126,7 +1132,7 @@ public com.google.protobuf.ByteString getSessionBytes() {
      * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
-     * <code>string session = 1;</code>
+     * <code>string session = 1 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @param value The session to set.
      * @return This builder for chaining.
@@ -1158,7 +1164,7 @@ public Builder setSession(java.lang.String value) {
      * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
-     * <code>string session = 1;</code>
+     * <code>string session = 1 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @return This builder for chaining.
      */
@@ -1186,7 +1192,7 @@ public Builder clearSession() {
      * guide](https://cloud.google.com/dialogflow/docs/api-overview).
      * </pre>
      *
-     * <code>string session = 1;</code>
+     * <code>string session = 1 [(.google.api.field_behavior) = REQUIRED];</code>
      *
      * @param value The bytes for session to set.
      * @return This builder for chaining.
@@ -1405,7 +1411,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryParametersOrBuilder getQueryPara
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return Whether the queryInput field is set.
      */
@@ -1423,7 +1431,9 @@ public boolean hasQueryInput() {
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return The queryInput.
      */
@@ -1447,7 +1457,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryInput getQueryInput() {
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput value) {
       if (queryInputBuilder_ == null) {
@@ -1473,7 +1485,9 @@ public Builder setQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput valu
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setQueryInput(
         com.google.cloud.dialogflow.v2beta1.QueryInput.Builder builderForValue) {
@@ -1497,7 +1511,9 @@ public Builder setQueryInput(
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder mergeQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput value) {
       if (queryInputBuilder_ == null) {
@@ -1527,7 +1543,9 @@ public Builder mergeQueryInput(com.google.cloud.dialogflow.v2beta1.QueryInput va
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder clearQueryInput() {
       if (queryInputBuilder_ == null) {
@@ -1551,7 +1569,9 @@ public Builder clearQueryInput() {
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryInput.Builder getQueryInputBuilder() {
 
@@ -1569,7 +1589,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryInput.Builder getQueryInputBuild
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBuilder() {
       if (queryInputBuilder_ != null) {
@@ -1591,7 +1613,9 @@ public com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBu
      * 3.  an event that specifies which intent to trigger.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.QueryInput,
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequestOrBuilder.java
index 518e042d1..d2f5e1f90 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/StreamingDetectIntentRequestOrBuilder.java
@@ -41,7 +41,7 @@ public interface StreamingDetectIntentRequestOrBuilder
    * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
-   * <code>string session = 1;</code>
+   * <code>string session = 1 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @return The session.
    */
@@ -64,7 +64,7 @@ public interface StreamingDetectIntentRequestOrBuilder
    * guide](https://cloud.google.com/dialogflow/docs/api-overview).
    * </pre>
    *
-   * <code>string session = 1;</code>
+   * <code>string session = 1 [(.google.api.field_behavior) = REQUIRED];</code>
    *
    * @return The bytes for session.
    */
@@ -116,7 +116,9 @@ public interface StreamingDetectIntentRequestOrBuilder
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the queryInput field is set.
    */
@@ -132,7 +134,9 @@ public interface StreamingDetectIntentRequestOrBuilder
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The queryInput.
    */
@@ -148,7 +152,9 @@ public interface StreamingDetectIntentRequestOrBuilder
    * 3.  an event that specifies which intent to trigger.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.QueryInput query_input = 3;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.QueryInput query_input = 3 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.QueryInputOrBuilder getQueryInputOrBuilder();
 
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java
index 612471ff2..4e09aaf07 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequest.java
@@ -159,7 +159,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Required. The intent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the intent field is set.
    */
@@ -174,7 +176,9 @@ public boolean hasIntent() {
    * Required. The intent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The intent.
    */
@@ -191,7 +195,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent getIntent() {
    * Required. The intent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder() {
@@ -742,7 +748,9 @@ public Builder mergeFrom(
      * Required. The intent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return Whether the intent field is set.
      */
@@ -756,7 +764,9 @@ public boolean hasIntent() {
      * Required. The intent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return The intent.
      */
@@ -776,7 +786,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent getIntent() {
      * Required. The intent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
       if (intentBuilder_ == null) {
@@ -798,7 +810,9 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
      * Required. The intent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent.Builder builderForValue) {
       if (intentBuilder_ == null) {
@@ -817,7 +831,9 @@ public Builder setIntent(com.google.cloud.dialogflow.v2beta1.Intent.Builder buil
      * Required. The intent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder mergeIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
       if (intentBuilder_ == null) {
@@ -843,7 +859,9 @@ public Builder mergeIntent(com.google.cloud.dialogflow.v2beta1.Intent value) {
      * Required. The intent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder clearIntent() {
       if (intentBuilder_ == null) {
@@ -863,7 +881,9 @@ public Builder clearIntent() {
      * Required. The intent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.Intent.Builder getIntentBuilder() {
 
@@ -877,7 +897,9 @@ public com.google.cloud.dialogflow.v2beta1.Intent.Builder getIntentBuilder() {
      * Required. The intent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder() {
       if (intentBuilder_ != null) {
@@ -895,7 +917,9 @@ public com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder()
      * Required. The intent to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.Intent,
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequestOrBuilder.java
index ee1bdfd56..80bab3cb3 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateIntentRequestOrBuilder.java
@@ -30,7 +30,9 @@ public interface UpdateIntentRequestOrBuilder
    * Required. The intent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the intent field is set.
    */
@@ -42,7 +44,9 @@ public interface UpdateIntentRequestOrBuilder
    * Required. The intent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The intent.
    */
@@ -54,7 +58,9 @@ public interface UpdateIntentRequestOrBuilder
    * Required. The intent to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.Intent intent = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.Intent intent = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.IntentOrBuilder getIntentOrBuilder();
 
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java
index 186260d0a..1c15765fb 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequest.java
@@ -144,7 +144,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * Required. The session entity type to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the sessionEntityType field is set.
    */
@@ -159,7 +161,9 @@ public boolean hasSessionEntityType() {
    * Required. The session entity type to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The sessionEntityType.
    */
@@ -176,7 +180,9 @@ public com.google.cloud.dialogflow.v2beta1.SessionEntityType getSessionEntityTyp
    * Required. The session entity type to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   @java.lang.Override
   public com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder
@@ -610,7 +616,9 @@ public Builder mergeFrom(
      * Required. The session entity type to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return Whether the sessionEntityType field is set.
      */
@@ -624,7 +632,9 @@ public boolean hasSessionEntityType() {
      * Required. The session entity type to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      *
      * @return The sessionEntityType.
      */
@@ -644,7 +654,9 @@ public com.google.cloud.dialogflow.v2beta1.SessionEntityType getSessionEntityTyp
      * Required. The session entity type to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setSessionEntityType(
         com.google.cloud.dialogflow.v2beta1.SessionEntityType value) {
@@ -667,7 +679,9 @@ public Builder setSessionEntityType(
      * Required. The session entity type to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder setSessionEntityType(
         com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder builderForValue) {
@@ -687,7 +701,9 @@ public Builder setSessionEntityType(
      * Required. The session entity type to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder mergeSessionEntityType(
         com.google.cloud.dialogflow.v2beta1.SessionEntityType value) {
@@ -714,7 +730,9 @@ public Builder mergeSessionEntityType(
      * Required. The session entity type to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public Builder clearSessionEntityType() {
       if (sessionEntityTypeBuilder_ == null) {
@@ -734,7 +752,9 @@ public Builder clearSessionEntityType() {
      * Required. The session entity type to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.SessionEntityType.Builder
         getSessionEntityTypeBuilder() {
@@ -749,7 +769,9 @@ public Builder clearSessionEntityType() {
      * Required. The session entity type to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     public com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder
         getSessionEntityTypeOrBuilder() {
@@ -768,7 +790,9 @@ public Builder clearSessionEntityType() {
      * Required. The session entity type to update.
      * </pre>
      *
-     * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+     * <code>
+     * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+     * </code>
      */
     private com.google.protobuf.SingleFieldBuilderV3<
             com.google.cloud.dialogflow.v2beta1.SessionEntityType,
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequestOrBuilder.java b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequestOrBuilder.java
index 254a117ac..0541bd349 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequestOrBuilder.java
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/UpdateSessionEntityTypeRequestOrBuilder.java
@@ -30,7 +30,9 @@ public interface UpdateSessionEntityTypeRequestOrBuilder
    * Required. The session entity type to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return Whether the sessionEntityType field is set.
    */
@@ -42,7 +44,9 @@ public interface UpdateSessionEntityTypeRequestOrBuilder
    * Required. The session entity type to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    *
    * @return The sessionEntityType.
    */
@@ -54,7 +58,9 @@ public interface UpdateSessionEntityTypeRequestOrBuilder
    * Required. The session entity type to update.
    * </pre>
    *
-   * <code>.google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1;</code>
+   * <code>
+   * .google.cloud.dialogflow.v2beta1.SessionEntityType session_entity_type = 1 [(.google.api.field_behavior) = REQUIRED];
+   * </code>
    */
   com.google.cloud.dialogflow.v2beta1.SessionEntityTypeOrBuilder getSessionEntityTypeOrBuilder();
 
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/agent.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/agent.proto
index 71ada6e6a..dec8dde09 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/agent.proto
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/agent.proto
@@ -332,7 +332,7 @@ message GetAgentRequest {
 // The request message for [Agents.SetAgent][google.cloud.dialogflow.v2beta1.Agents.SetAgent].
 message SetAgentRequest {
   // Required. The agent to update.
-  Agent agent = 1;
+  Agent agent = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Optional. The mask to control which fields get updated.
   google.protobuf.FieldMask update_mask = 2;
@@ -408,7 +408,12 @@ message TrainAgentRequest {
 message ExportAgentRequest {
   // Required. The project that the agent to export is associated with.
   // Format: `projects/<Project ID>`.
-  string parent = 1;
+  string parent = 1 [
+    (google.api.field_behavior) = REQUIRED,
+    (google.api.resource_reference) = {
+      child_type: "dialogflow.googleapis.com/Agent"
+    }
+  ];
 
   // Optional. The
   // [Google Cloud Storage](https://cloud.google.com/storage/docs/)
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/audio_config.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/audio_config.proto
index 6394f3899..0d3c3acf4 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/audio_config.proto
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/audio_config.proto
@@ -30,6 +30,36 @@ option java_outer_classname = "AudioConfigProto";
 option java_package = "com.google.cloud.dialogflow.v2beta1";
 option objc_class_prefix = "DF";
 
+// Hints for the speech recognizer to help with recognition in a specific
+// conversation state.
+message SpeechContext {
+  // Optional. A list of strings containing words and phrases that the speech
+  // recognizer should recognize with higher likelihood.
+  //
+  // This list can be used to:
+  //
+  // * improve accuracy for words and phrases you expect the user to say,
+  //   e.g. typical commands for your Dialogflow agent
+  // * add additional words to the speech recognizer vocabulary
+  // * ...
+  //
+  // See the [Cloud Speech
+  // documentation](https://cloud.google.com/speech-to-text/quotas) for usage
+  // limits.
+  repeated string phrases = 1;
+
+  // Optional. Boost for this context compared to other contexts:
+  //
+  // * If the boost is positive, Dialogflow will increase the probability that
+  //   the phrases in this context are recognized over similar sounding phrases.
+  // * If the boost is unspecified or non-positive, Dialogflow will not apply
+  //   any boost.
+  //
+  // Dialogflow recommends that you use boosts in the range (0, 20] and that you
+  // find a value that fits your use case with binary search.
+  float boost = 2;
+}
+
 // Audio encoding of the audio content sent in the conversational query request.
 // Refer to the
 // [Cloud Speech API
@@ -79,35 +109,6 @@ enum AudioEncoding {
   AUDIO_ENCODING_SPEEX_WITH_HEADER_BYTE = 7;
 }
 
-// Hints for the speech recognizer to help with recognition in a specific
-// conversation state.
-message SpeechContext {
-  // Optional. A list of strings containing words and phrases that the speech
-  // recognizer should recognize with higher likelihood.
-  //
-  // This list can be used to:
-  // * improve accuracy for words and phrases you expect the user to say,
-  //   e.g. typical commands for your Dialogflow agent
-  // * add additional words to the speech recognizer vocabulary
-  // * ...
-  //
-  // See the [Cloud Speech
-  // documentation](https://cloud.google.com/speech-to-text/quotas) for usage
-  // limits.
-  repeated string phrases = 1;
-
-  // Optional. Boost for this context compared to other contexts:
-  //
-  // * If the boost is positive, Dialogflow will increase the probability that
-  //   the phrases in this context are recognized over similar sounding phrases.
-  // * If the boost is unspecified or non-positive, Dialogflow will not apply
-  //   any boost.
-  //
-  // Dialogflow recommends that you use boosts in the range (0, 20] and that you
-  // find a value that fits your use case with binary search.
-  float boost = 2;
-}
-
 // Information for a word recognized by the speech recognizer.
 message SpeechWordInfo {
   // The word this info is for.
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/context.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/context.proto
index 777e52dd5..e829882d9 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/context.proto
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/context.proto
@@ -115,6 +115,7 @@ service Contexts {
       }
     };
     option (google.api.method_signature) = "context,update_mask";
+    option (google.api.method_signature) = "context";
   }
 
   // Deletes the specified context.
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/document.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/document.proto
index 5349de59c..d3facb741 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/document.proto
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/document.proto
@@ -122,6 +122,7 @@ service Documents {
       }
     };
     option (google.api.method_signature) = "document,update_mask";
+    option (google.api.method_signature) = "document";
     option (google.longrunning.operation_info) = {
       response_type: "Document"
       metadata_type: "KnowledgeOperationMetadata"
@@ -381,3 +382,15 @@ message ReloadDocumentRequest {
     GcsSource gcs_source = 3;
   }
 }
+
+// Response message for [Documents.AutoApproveSmartMessagingEntries].
+message AutoApproveSmartMessagingEntriesResponse {
+  // Number of smart messaging entries enabled.
+  int32 enabled_count = 1;
+
+  // Number of smart messaging entries disabled.
+  int32 disabled_count = 2;
+
+  // Number of smart messaging entries unreviewed.
+  int32 unreviewed_count = 3;
+}
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/entity_type.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/entity_type.proto
index 032b97bf3..457c85916 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/entity_type.proto
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/entity_type.proto
@@ -150,6 +150,8 @@ service EntityTypes {
         body: "*"
       }
     };
+    option (google.api.method_signature) = "parent,entities";
+    option (google.api.method_signature) = "parent,entities,language_code";
     option (google.longrunning.operation_info) = {
       response_type: "google.protobuf.Empty"
       metadata_type: "google.protobuf.Struct"
@@ -477,7 +479,7 @@ message BatchCreateEntitiesRequest {
   ];
 
   // Required. The entities to create.
-  repeated EntityType.Entity entities = 2;
+  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.
@@ -499,7 +501,7 @@ message BatchUpdateEntitiesRequest {
   ];
 
   // Required. The entities to update or create.
-  repeated EntityType.Entity entities = 2;
+  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.
@@ -526,7 +528,7 @@ message BatchDeleteEntitiesRequest {
   // Required. The reference `values` of the entities to delete. Note that
   // these are not fully-qualified names, i.e. they don't start with
   // `projects/<Project ID>`.
-  repeated string entity_values = 2;
+  repeated string entity_values = 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.
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/environment.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/environment.proto
index 2a1069692..73f4e2980 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/environment.proto
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/environment.proto
@@ -17,13 +17,13 @@ syntax = "proto3";
 package google.cloud.dialogflow.v2beta1;
 
 import "google/api/annotations.proto";
+import "google/api/client.proto";
 import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
 import "google/cloud/dialogflow/v2beta1/audio_config.proto";
 import "google/protobuf/empty.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
-import "google/api/client.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2beta1";
@@ -48,6 +48,7 @@ service Environments {
         get: "/v2beta1/{parent=projects/*/locations/*/agent}/environments"
       }
     };
+    option (google.api.method_signature) = "parent";
   }
 }
 
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/intent.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/intent.proto
index a0a774c78..cfecbc142 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/intent.proto
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/intent.proto
@@ -138,6 +138,7 @@ service Intents {
         body: "*"
       }
     };
+    option (google.api.method_signature) = "parent,intents";
     option (google.longrunning.operation_info) = {
       response_type: "google.protobuf.Empty"
       metadata_type: "google.protobuf.Struct"
@@ -1249,7 +1250,7 @@ message CreateIntentRequest {
   ];
 
   // Required. The intent to create.
-  Intent intent = 2;
+  Intent intent = 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.
@@ -1265,7 +1266,7 @@ message CreateIntentRequest {
 // The request message for [Intents.UpdateIntent][google.cloud.dialogflow.v2beta1.Intents.UpdateIntent].
 message UpdateIntentRequest {
   // Required. The intent to update.
-  Intent intent = 1;
+  Intent intent = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Optional. The language used to access language-specific data.
   // If not specified, the agent's default language is used.
@@ -1355,7 +1356,7 @@ message BatchDeleteIntentsRequest {
 
   // Required. The collection of intents to delete. Only intent `name` must be
   // filled in.
-  repeated Intent intents = 2;
+  repeated Intent intents = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
 // This message is a wrapper around a collection of intents.
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/knowledge_base.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/knowledge_base.proto
index 4c428f689..71e72dcc5 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/knowledge_base.proto
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/knowledge_base.proto
@@ -110,6 +110,7 @@ service KnowledgeBases {
       }
     };
     option (google.api.method_signature) = "knowledge_base,update_mask";
+    option (google.api.method_signature) = "knowledge_base";
   }
 }
 
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session.proto
index 03804575d..ef882e190 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session.proto
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session.proto
@@ -100,9 +100,12 @@ message DetectIntentRequest {
   //
   // For more information, see the [API interactions
   // guide](https://cloud.google.com/dialogflow/docs/api-overview).
-  string session = 1 [(google.api.resource_reference) = {
-                        type: "dialogflow.googleapis.com/Session"
-                      }];
+  string session = 1 [
+    (google.api.field_behavior) = REQUIRED,
+    (google.api.resource_reference) = {
+      type: "dialogflow.googleapis.com/Session"
+    }
+  ];
 
   // The parameters of this query.
   QueryParameters query_params = 2;
@@ -115,7 +118,7 @@ message DetectIntentRequest {
   // 2.  a conversational query in the form of text, or
   //
   // 3.  an event that specifies which intent to trigger.
-  QueryInput query_input = 3;
+  QueryInput query_input = 3 [(google.api.field_behavior) = REQUIRED];
 
   // Instructs the speech synthesizer how to generate the output
   // audio. If this field is not set and agent-level speech synthesizer is not
@@ -470,7 +473,7 @@ message StreamingDetectIntentRequest {
   //
   // For more information, see the [API interactions
   // guide](https://cloud.google.com/dialogflow/docs/api-overview).
-  string session = 1;
+  string session = 1 [(google.api.field_behavior) = REQUIRED];
 
   // The parameters of this query.
   QueryParameters query_params = 2;
@@ -483,7 +486,7 @@ message StreamingDetectIntentRequest {
   // 2.  a conversational query in the form of text, or
   //
   // 3.  an event that specifies which intent to trigger.
-  QueryInput query_input = 3;
+  QueryInput query_input = 3 [(google.api.field_behavior) = REQUIRED];
 
   // DEPRECATED. Please use [InputAudioConfig.single_utterance][google.cloud.dialogflow.v2beta1.InputAudioConfig.single_utterance] instead.
   // If `false` (default), recognition does not cease until the
diff --git a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session_entity_type.proto b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session_entity_type.proto
index 7b9b93ebf..07b73530e 100644
--- a/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session_entity_type.proto
+++ b/proto-google-cloud-dialogflow-v2beta1/src/main/proto/google/cloud/dialogflow/v2beta1/session_entity_type.proto
@@ -281,13 +281,13 @@ message CreateSessionEntityTypeRequest {
   ];
 
   // Required. The session entity type to create.
-  SessionEntityType session_entity_type = 2;
+  SessionEntityType session_entity_type = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
 // The request message for [SessionEntityTypes.UpdateSessionEntityType][google.cloud.dialogflow.v2beta1.SessionEntityTypes.UpdateSessionEntityType].
 message UpdateSessionEntityTypeRequest {
   // Required. The session entity type to update.
-  SessionEntityType session_entity_type = 1;
+  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;
diff --git a/synth.metadata b/synth.metadata
index c748296d8..dafd5f651 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,16 +11,16 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "84ebe7c62f4c0875e001752fa84e87e629a1d418",
-        "internalRef": "321243814"
+        "sha": "546f389d95dbbc88d9d5a00fae25b29d49a0d5b6",
+        "internalRef": "323436667"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "84ebe7c62f4c0875e001752fa84e87e629a1d418",
-        "internalRef": "321243814"
+        "sha": "546f389d95dbbc88d9d5a00fae25b29d49a0d5b6",
+        "internalRef": "323436667"
       }
     },
     {
@@ -545,12 +545,9 @@
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeOrBuilder.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EntityTypeProto.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/Environment.java",
-    "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentContextName.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentName.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentOrBuilder.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentProto.java",
-    "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentSessionEntityTypeName.java",
-    "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EnvironmentSessionName.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInput.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/EventInputOrBuilder.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ExportAgentRequest.java",
@@ -628,7 +625,6 @@
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioConfig.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioConfigOrBuilder.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/OutputAudioEncoding.java",
-    "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ProjectAgentName.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/ProjectName.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInput.java",
     "proto-google-cloud-dialogflow-v2beta1/src/main/java/com/google/cloud/dialogflow/v2beta1/QueryInputOrBuilder.java",