diff --git a/google/cloud/dialogflow/v2beta1/BUILD.bazel b/google/cloud/dialogflow/v2beta1/BUILD.bazel
index aa5e2154..ef81880c 100644
--- a/google/cloud/dialogflow/v2beta1/BUILD.bazel
+++ b/google/cloud/dialogflow/v2beta1/BUILD.bazel
@@ -86,6 +86,7 @@ java_gapic_library(
     name = "dialogflow_java_gapic",
     srcs = [":dialogflow_proto_with_info"],
     grpc_service_config = "dialogflow_grpc_service_config.json",
+    package = "google.cloud.dialogflow.v2beta1",
     test_deps = [
         ":dialogflow_java_grpc",
     ],
diff --git a/google/cloud/dialogflow/v2beta1/audio_config.proto b/google/cloud/dialogflow/v2beta1/audio_config.proto
index f9a9d53e..7afa9bbc 100644
--- a/google/cloud/dialogflow/v2beta1/audio_config.proto
+++ b/google/cloud/dialogflow/v2beta1/audio_config.proto
@@ -30,36 +30,6 @@ 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
@@ -109,6 +79,36 @@ 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/google/cloud/dialogflow/v2beta1/context.proto b/google/cloud/dialogflow/v2beta1/context.proto
index 94955205..82b61f29 100644
--- a/google/cloud/dialogflow/v2beta1/context.proto
+++ b/google/cloud/dialogflow/v2beta1/context.proto
@@ -217,7 +217,8 @@ message Context {
   // -   MapKey value: parameter name
   // -   MapValue type:
   //     -   If parameter's entity type is a composite entity: map
-  //     -   Else: string or number, depending on parameter value type
+  //     -   Else: depending on parameter value type, could be one of string,
+  //         number, boolean, null, list or map
   // -   MapValue value:
   //     -   If parameter's entity type is a composite entity:
   //         map from composite entity property names to property values
diff --git a/google/cloud/dialogflow/v2beta1/session.proto b/google/cloud/dialogflow/v2beta1/session.proto
index 566824d5..dd5d86c6 100644
--- a/google/cloud/dialogflow/v2beta1/session.proto
+++ b/google/cloud/dialogflow/v2beta1/session.proto
@@ -321,7 +321,8 @@ message QueryResult {
   // -   MapKey value: parameter name
   // -   MapValue type:
   //     -   If parameter's entity type is a composite entity: map
-  //     -   Else: string or number, depending on parameter value type
+  //     -   Else: depending on parameter value type, could be one of string,
+  //         number, boolean, null, list or map
   // -   MapValue value:
   //     -   If parameter's entity type is a composite entity:
   //         map from composite entity property names to property values
@@ -740,7 +741,8 @@ message EventInput {
   // -   MapKey value: parameter name
   // -   MapValue type:
   //     -   If parameter's entity type is a composite entity: map
-  //     -   Else: string or number, depending on parameter value type
+  //     -   Else: depending on parameter value type, could be one of string,
+  //         number, boolean, null, list or map
   // -   MapValue value:
   //     -   If parameter's entity type is a composite entity:
   //         map from composite entity property names to property values
diff --git a/google/cloud/dialogflow/v2beta1/validation_result.proto b/google/cloud/dialogflow/v2beta1/validation_result.proto
index 9ab491f7..2f655e84 100644
--- a/google/cloud/dialogflow/v2beta1/validation_result.proto
+++ b/google/cloud/dialogflow/v2beta1/validation_result.proto
@@ -33,7 +33,7 @@ message ValidationError {
     // Not specified. This value should never be used.
     SEVERITY_UNSPECIFIED = 0;
 
-    // The agent doesn't follow Dialogflow best practicies.
+    // The agent doesn't follow Dialogflow best practices.
     INFO = 1;
 
     // The agent may not behave as expected.