@@ -185,18 +185,6 @@ message AnswerFeedback {
 
 // Detail feedback of Agent Assistant result.
 message AgentAssistantFeedback {
-// Feedback for conversation summarization.
-message SummarizationFeedback {
-// Timestamp when composing of the summary starts.
-google.protobuf.Timestamp start_timestamp = 1;
-
-// Timestamp when the summary was submitted.
-google.protobuf.Timestamp submit_timestamp = 2;
-
-// Text of actual submitted summary.
-string summary_text = 3;
-}
-
 // Relevance of an answer.
 enum AnswerRelevance {
 // Answer relevance unspecified.
@@ -233,6 +221,18 @@ message AgentAssistantFeedback {
 EFFICIENT = 2;
 }
 
+// Feedback for conversation summarization.
+message SummarizationFeedback {
+// Timestamp when composing of the summary starts.
+google.protobuf.Timestamp start_timestamp = 1;
+
+// Timestamp when the summary was submitted.
+google.protobuf.Timestamp submit_timestamp = 2;
+
+// Text of actual submitted summary.
+string summary_text = 3;
+}
+
 // Optional. Whether or not the suggested answer is relevant.
 //
 // For example:

@@ -16,12 +16,12 @@ syntax = "proto3";
 
 package google.cloud.dialogflow.v2beta1;
 
+import "google/api/annotations.proto";
 import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
 import "google/protobuf/duration.proto";
 import "google/protobuf/field_mask.proto";
 import "google/protobuf/timestamp.proto";
-import "google/api/annotations.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2beta1";
@@ -31,36 +31,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
@@ -110,29 +80,34 @@ enum AudioEncoding {
 AUDIO_ENCODING_SPEEX_WITH_HEADER_BYTE = 7;
 }
 
-// Information for a word recognized by the speech recognizer.
-message SpeechWordInfo {
-// The word this info is for.
-string word = 3;
-
-// Time offset relative to the beginning of the audio that corresponds to the
-// start of the spoken word. This is an experimental feature and the accuracy
-// of the time offset can vary.
-google.protobuf.Duration start_offset = 1;
-
-// Time offset relative to the beginning of the audio that corresponds to the
-// end of the spoken word. This is an experimental feature and the accuracy of
-// the time offset can vary.
-google.protobuf.Duration end_offset = 2;
+// 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;
 
-// The Speech confidence between 0.0 and 1.0 for this word. A higher number
-// indicates an estimated greater likelihood that the recognized word is
-// correct. The default of 0.0 is a sentinel value indicating that confidence
-// was not set.
+// Optional. Boost for this context compared to other contexts:
 //
-// This field is not guaranteed to be fully stable over time for the same
-// audio input. Users should also not rely on it to always be provided.
-float confidence = 4;
+// * 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;
 }
 
 // Variant of the specified [Speech model][google.cloud.dialogflow.v2beta1.InputAudioConfig.model] to use.
@@ -178,6 +153,31 @@ enum SpeechModelVariant {
 USE_ENHANCED = 3;
 }
 
+// Information for a word recognized by the speech recognizer.
+message SpeechWordInfo {
+// The word this info is for.
+string word = 3;
+
+// Time offset relative to the beginning of the audio that corresponds to the
+// start of the spoken word. This is an experimental feature and the accuracy
+// of the time offset can vary.
+google.protobuf.Duration start_offset = 1;
+
+// Time offset relative to the beginning of the audio that corresponds to the
+// end of the spoken word. This is an experimental feature and the accuracy of
+// the time offset can vary.
+google.protobuf.Duration end_offset = 2;
+
+// The Speech confidence between 0.0 and 1.0 for this word. A higher number
+// indicates an estimated greater likelihood that the recognized word is
+// correct. The default of 0.0 is a sentinel value indicating that confidence
+// was not set.
+//
+// This field is not guaranteed to be fully stable over time for the same
+// audio input. Users should also not rely on it to always be provided.
+float confidence = 4;
+}
+
 // Instructs the speech recognizer on how to process the audio content.
 message InputAudioConfig {
 // Required. Audio encoding of the audio content to process.
@@ -257,6 +257,23 @@ message InputAudioConfig {
 bool disable_no_speech_recognized_event = 14;
 }
 
+// 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;
+}
+
 // Description of which voice to use for speech synthesis.
 message VoiceSelectionParams {
 // Optional. The name of the voice. If not set, the service will choose a
@@ -307,47 +324,6 @@ 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 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.
-message OutputAudioConfig {
-// Required. Audio encoding of the synthesized audio content.
-OutputAudioEncoding audio_encoding = 1 [(google.api.field_behavior) = REQUIRED];
-
-// The synthesis sample rate (in hertz) for this audio. If not
-// provided, then the synthesizer will use the default sample rate based on
-// the audio encoding. If this is different from the voice's natural sample
-// rate, then the synthesizer will honor this request by converting to the
-// desired sample rate (which might result in worse audio quality).
-int32 sample_rate_hertz = 2;
-
-// Configuration of how speech should be synthesized.
-SynthesizeSpeechConfig synthesize_speech_config = 3;
-}
-
-// A wrapper of repeated TelephonyDtmf digits.
-message TelephonyDtmfEvents {
-// A sequence of TelephonyDtmf digits.
-repeated TelephonyDtmf dtmf_events = 1;
-}
-
 // Audio encoding of the output audio format in Text-To-Speech.
 enum OutputAudioEncoding {
 // Not specified.
@@ -373,16 +349,22 @@ enum OutputAudioEncoding {
 OUTPUT_AUDIO_ENCODING_MULAW = 5;
 }
 
-// Configures speech transcription for [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile].
-message SpeechToTextConfig {
-// The speech model used in speech to text.
-// `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
-// `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2beta1.AnalyzeContentRequest] and
-// [AnalyzeContentRequest][google.cloud.dialogflow.v2beta1.AnalyzeContentRequest] request.
-// If enhanced model variant is specified and an enhanced
-// version of the specified model for the language does not exist, then it
-// would emit an error.
-SpeechModelVariant speech_model_variant = 1;
+// Instructs the speech synthesizer 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.
+message OutputAudioConfig {
+// Required. Audio encoding of the synthesized audio content.
+OutputAudioEncoding audio_encoding = 1 [(google.api.field_behavior) = REQUIRED];
+
+// The synthesis sample rate (in hertz) for this audio. If not
+// provided, then the synthesizer will use the default sample rate based on
+// the audio encoding. If this is different from the voice's natural sample
+// rate, then the synthesizer will honor this request by converting to the
+// desired sample rate (which might result in worse audio quality).
+int32 sample_rate_hertz = 2;
+
+// Configuration of how speech should be synthesized.
+SynthesizeSpeechConfig synthesize_speech_config = 3;
 }
 
 // [DTMF](https://en.wikipedia.org/wiki/Dual-tone_multi-frequency_signaling)
@@ -439,3 +421,21 @@ enum TelephonyDtmf {
 // Pound/diamond/hash/square/gate/octothorpe: '#'.
 DTMF_POUND = 16;
 }
+
+// A wrapper of repeated TelephonyDtmf digits.
+message TelephonyDtmfEvents {
+// A sequence of TelephonyDtmf digits.
+repeated TelephonyDtmf dtmf_events = 1;
+}
+
+// Configures speech transcription for [ConversationProfile][google.cloud.dialogflow.v2beta1.ConversationProfile].
+message SpeechToTextConfig {
+// The speech model used in speech to text.
+// `SPEECH_MODEL_VARIANT_UNSPECIFIED`, `USE_BEST_AVAILABLE` will be treated as
+// `USE_ENHANCED`. It can be overridden in [AnalyzeContentRequest][google.cloud.dialogflow.v2beta1.AnalyzeContentRequest] and
+// [AnalyzeContentRequest][google.cloud.dialogflow.v2beta1.AnalyzeContentRequest] request.
+// If enhanced model variant is specified and an enhanced
+// version of the specified model for the language does not exist, then it
+// would emit an error.
+SpeechModelVariant speech_model_variant = 1;
+}

@@ -21,6 +21,7 @@ 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/cloud/dialogflow/v2beta1/conversation_profile.proto";
 import "google/cloud/dialogflow/v2beta1/gcs.proto";
 import "google/cloud/dialogflow/v2beta1/participant.proto";
 import "google/cloud/dialogflow/v2beta1/session.proto";

@@ -16,9 +16,9 @@ syntax = "proto3";
 
 package google.cloud.dialogflow.v2beta1;
 
+import "google/api/annotations.proto";
 import "google/cloud/dialogflow/v2beta1/participant.proto";
 import "google/rpc/status.proto";
-import "google/api/annotations.proto";
 
 option cc_enable_arenas = true;
 option csharp_namespace = "Google.Cloud.Dialogflow.V2beta1";

@@ -245,17 +245,6 @@ message Document {
 pattern: "projects/{project}/locations/{location}/knowledgeBases/{knowledge_base}/documents/{document}"
 };
 
-// The status of a reload attempt.
-message ReloadStatus {
-// Output only. The time of a reload attempt.
-// This reload may have been triggered automatically or manually and may
-// not have succeeded.
-google.protobuf.Timestamp time = 1;
-
-// Output only. The status of a reload attempt or the initial load.
-google.rpc.Status status = 2;
-}
-
 // The knowledge type of document content.
 enum KnowledgeType {
 // The type is unspecified or arbitrary.
@@ -282,6 +271,17 @@ message Document {
 SMART_REPLY = 4;
 }
 
+// The status of a reload attempt.
+message ReloadStatus {
+// Output only. The time of a reload attempt.
+// This reload may have been triggered automatically or manually and may
+// not have succeeded.
+google.protobuf.Timestamp time = 1;
+
+// Output only. The status of a reload attempt or the initial load.
+google.rpc.Status status = 2;
+}
+
 // Optional. The document resource name.
 // The name must be empty when creating a document.
 // Format: `projects/<Project ID>/locations/<Location