diff --git a/google/cloud/dialogflow/v2/BUILD.bazel b/google/cloud/dialogflow/v2/BUILD.bazel
index 9922be4bf6..20c5afe688 100644
--- a/google/cloud/dialogflow/v2/BUILD.bazel
+++ b/google/cloud/dialogflow/v2/BUILD.bazel
@@ -1,5 +1,5 @@
 # This file was automatically generated by BuildFileGenerator
-# https://github.com/googleapis/gapic-generator/tree/master/rules_gapic/bazel
+# https://github.com/googleapis/rules_gapic/tree/master/bazel
 
 # Most of the manual changes to this file will be overwritten.
 # It's **only** allowed to change the following rule attribute values:
@@ -94,13 +94,6 @@ java_gapic_library(
 java_gapic_test(
     name = "dialogflow_java_gapic_test_suite",
     test_classes = [
-        "com.google.cloud.dialogflow.v2.AgentsClientTest",
-        "com.google.cloud.dialogflow.v2.ContextsClientTest",
-        "com.google.cloud.dialogflow.v2.EntityTypesClientTest",
-        "com.google.cloud.dialogflow.v2.EnvironmentsClientTest",
-        "com.google.cloud.dialogflow.v2.IntentsClientTest",
-        "com.google.cloud.dialogflow.v2.SessionEntityTypesClientTest",
-        "com.google.cloud.dialogflow.v2.SessionsClientTest",
     ],
     runtime_deps = [":dialogflow_java_gapic_test"],
 )
@@ -145,6 +138,7 @@ go_gapic_library(
     srcs = [":dialogflow_proto_with_info"],
     grpc_service_config = "dialogflow_grpc_service_config.json",
     importpath = "cloud.google.com/go/dialogflow/apiv2;dialogflow",
+    metadata = True,
     service_yaml = "dialogflow_v2.yaml",
     deps = [
         ":dialogflow_go_proto",
@@ -168,6 +162,7 @@ go_gapic_assembly_pkg(
     name = "gapi-cloud-dialogflow-v2-go",
     deps = [
         ":dialogflow_go_gapic",
+        ":dialogflow_go_gapic_srcjar-metadata.srcjar",
         ":dialogflow_go_gapic_srcjar-test.srcjar",
         ":dialogflow_go_proto",
     ],
diff --git a/google/cloud/dialogflow/v2/agent.proto b/google/cloud/dialogflow/v2/agent.proto
index 82c1426c76..4ac05cd2ac 100644
--- a/google/cloud/dialogflow/v2/agent.proto
+++ b/google/cloud/dialogflow/v2/agent.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/v2/audio_config.proto b/google/cloud/dialogflow/v2/audio_config.proto
index 19b1e09b90..8a6777c930 100644
--- a/google/cloud/dialogflow/v2/audio_config.proto
+++ b/google/cloud/dialogflow/v2/audio_config.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -264,23 +264,6 @@ message VoiceSelectionParams {
   SsmlVoiceGender ssml_gender = 2;
 }
 
-// Gender of the voice as described in
-// [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice).
-enum SsmlVoiceGender {
-  // An unspecified gender, which means that the client doesn't care which
-  // gender the selected voice will have.
-  SSML_VOICE_GENDER_UNSPECIFIED = 0;
-
-  // A male voice.
-  SSML_VOICE_GENDER_MALE = 1;
-
-  // A female voice.
-  SSML_VOICE_GENDER_FEMALE = 2;
-
-  // A gender-neutral voice.
-  SSML_VOICE_GENDER_NEUTRAL = 3;
-}
-
 // Configuration of how speech should be synthesized.
 message SynthesizeSpeechConfig {
   // Optional. Speaking rate/speed, in the range [0.25, 4.0]. 1.0 is the normal
@@ -313,6 +296,23 @@ message SynthesizeSpeechConfig {
   VoiceSelectionParams voice = 4;
 }
 
+// Gender of the voice as described in
+// [SSML voice element](https://www.w3.org/TR/speech-synthesis11/#edef_voice).
+enum SsmlVoiceGender {
+  // An unspecified gender, which means that the client doesn't care which
+  // gender the selected voice will have.
+  SSML_VOICE_GENDER_UNSPECIFIED = 0;
+
+  // A male voice.
+  SSML_VOICE_GENDER_MALE = 1;
+
+  // A female voice.
+  SSML_VOICE_GENDER_FEMALE = 2;
+
+  // A gender-neutral voice.
+  SSML_VOICE_GENDER_NEUTRAL = 3;
+}
+
 // Instructs the speech synthesizer on how to generate the output audio content.
 // If this audio config is supplied in a request, it overrides all existing
 // text-to-speech settings applied to the agent.
diff --git a/google/cloud/dialogflow/v2/context.proto b/google/cloud/dialogflow/v2/context.proto
index 41f88aa439..246ee7be47 100644
--- a/google/cloud/dialogflow/v2/context.proto
+++ b/google/cloud/dialogflow/v2/context.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/v2/dialogflow_v2.yaml b/google/cloud/dialogflow/v2/dialogflow_v2.yaml
index a8d105e43d..b6ab13fb5e 100644
--- a/google/cloud/dialogflow/v2/dialogflow_v2.yaml
+++ b/google/cloud/dialogflow/v2/dialogflow_v2.yaml
@@ -61,6 +61,21 @@ backend:
   - selector: 'google.longrunning.Operations.*'
     deadline: 60.0
 
+http:
+  rules:
+  - selector: google.longrunning.Operations.CancelOperation
+    post: '/v2/{name=projects/*/operations/*}:cancel'
+    additional_bindings:
+    - post: '/v2/{name=projects/*/locations/*/operations/*}:cancel'
+  - selector: google.longrunning.Operations.GetOperation
+    get: '/v2/{name=projects/*/operations/*}'
+    additional_bindings:
+    - get: '/v2/{name=projects/*/locations/*/operations/*}'
+  - selector: google.longrunning.Operations.ListOperations
+    get: '/v2/{name=projects/*}/operations'
+    additional_bindings:
+    - get: '/v2/{name=projects/*/locations/*}/operations'
+
 authentication:
   rules:
   - selector: 'google.cloud.dialogflow.v2.Agents.*'
diff --git a/google/cloud/dialogflow/v2/entity_type.proto b/google/cloud/dialogflow/v2/entity_type.proto
index 13fcdb050f..f8a69ec58e 100644
--- a/google/cloud/dialogflow/v2/entity_type.proto
+++ b/google/cloud/dialogflow/v2/entity_type.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/v2/environment.proto b/google/cloud/dialogflow/v2/environment.proto
index d48c210fc7..ef094c71e5 100644
--- a/google/cloud/dialogflow/v2/environment.proto
+++ b/google/cloud/dialogflow/v2/environment.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/v2/intent.proto b/google/cloud/dialogflow/v2/intent.proto
index f4f78acad8..3c7fa4aa99 100644
--- a/google/cloud/dialogflow/v2/intent.proto
+++ b/google/cloud/dialogflow/v2/intent.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -47,6 +47,9 @@ service Intents {
   rpc ListIntents(ListIntentsRequest) returns (ListIntentsResponse) {
     option (google.api.http) = {
       get: "/v2/{parent=projects/*/agent}/intents"
+      additional_bindings {
+        get: "/v2/{parent=projects/*/agent/environments/*}/intents"
+      }
     };
     option (google.api.method_signature) = "parent";
     option (google.api.method_signature) = "parent,language_code";
diff --git a/google/cloud/dialogflow/v2/session.proto b/google/cloud/dialogflow/v2/session.proto
index 2f6562bfe4..338489652f 100644
--- a/google/cloud/dialogflow/v2/session.proto
+++ b/google/cloud/dialogflow/v2/session.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -90,9 +90,10 @@ message DetectIntentRequest {
   // `projects/<Project ID>/agent/sessions/<Session ID>`, or
   // `projects/<Project ID>/agent/environments/<Environment ID>/users/<User
   // ID>/sessions/<Session ID>`. If `Environment ID` is not specified, we assume
-  // default 'draft' environment. If `User ID` is not specified, we are using
-  // "-". It's up to the API caller to choose an appropriate `Session ID` and
-  // `User Id`. They can be a random number or some type of user and session
+  // default 'draft' environment (`Environment ID` might be referred to as
+  // environment name at some places). If `User ID` is not specified, we are
+  // using "-". It's up to the API caller to choose an 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.
   //
diff --git a/google/cloud/dialogflow/v2/session_entity_type.proto b/google/cloud/dialogflow/v2/session_entity_type.proto
index 8d7fa89c0e..0eceed81cc 100644
--- a/google/cloud/dialogflow/v2/session_entity_type.proto
+++ b/google/cloud/dialogflow/v2/session_entity_type.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/v2/validation_result.proto b/google/cloud/dialogflow/v2/validation_result.proto
index 4758596f05..e41cb9cdea 100644
--- a/google/cloud/dialogflow/v2/validation_result.proto
+++ b/google/cloud/dialogflow/v2/validation_result.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/google/cloud/dialogflow/v2/webhook.proto b/google/cloud/dialogflow/v2/webhook.proto
index 19f529aede..ce72e92d3e 100644
--- a/google/cloud/dialogflow/v2/webhook.proto
+++ b/google/cloud/dialogflow/v2/webhook.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.