diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java
index 2a7e63a9fe23..68033c6e2dd7 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsClient.java
@@ -72,8 +72,8 @@
  * <pre>
  * <code>
  * try (AgentsClient agentsClient = AgentsClient.create()) {
- *   ProjectName parent = ProjectName.of("[PROJECT]");
- *   Agent response = agentsClient.getAgent(parent);
+ *   Agent agent = Agent.newBuilder().build();
+ *   Agent response = agentsClient.setAgent(agent);
  * }
  * </code>
  * </pre>
@@ -193,6 +193,167 @@ public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates/updates the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   Agent agent = Agent.newBuilder().build();
+   *   Agent response = agentsClient.setAgent(agent);
+   * }
+   * </code></pre>
+   *
+   * @param agent Required. The agent to update.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Agent setAgent(Agent agent) {
+
+    SetAgentRequest request = SetAgentRequest.newBuilder().setAgent(agent).build();
+    return setAgent(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates/updates the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   Agent agent = Agent.newBuilder().build();
+   *   SetAgentRequest request = SetAgentRequest.newBuilder()
+   *     .setAgent(agent)
+   *     .build();
+   *   Agent response = agentsClient.setAgent(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 setAgent(SetAgentRequest request) {
+    return setAgentCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates/updates the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   Agent agent = Agent.newBuilder().build();
+   *   SetAgentRequest request = SetAgentRequest.newBuilder()
+   *     .setAgent(agent)
+   *     .build();
+   *   ApiFuture&lt;Agent&gt; future = agentsClient.setAgentCallable().futureCall(request);
+   *   // Do something
+   *   Agent response = future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
+    return stub.setAgentCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   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(ProjectName parent) {
+
+    DeleteAgentRequest request =
+        DeleteAgentRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
+    deleteAgent(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   agentsClient.deleteAgent(parent.toString());
+   * }
+   * </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(String parent) {
+
+    DeleteAgentRequest request = DeleteAgentRequest.newBuilder().setParent(parent).build();
+    deleteAgent(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   DeleteAgentRequest request = DeleteAgentRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   agentsClient.deleteAgent(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 void deleteAgent(DeleteAgentRequest request) {
+    deleteAgentCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   DeleteAgentRequest request = DeleteAgentRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = agentsClient.deleteAgentCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
+    return stub.deleteAgentCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Retrieves the specified agent.
@@ -884,84 +1045,6 @@ public final UnaryCallable<RestoreAgentRequest, Operation> restoreAgentCallable(
     return stub.restoreAgentCallable();
   }
 
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Creates/updates the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   SetAgentRequest request = SetAgentRequest.newBuilder().build();
-   *   Agent response = agentsClient.setAgent(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 setAgent(SetAgentRequest request) {
-    return setAgentCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Creates/updates the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   SetAgentRequest request = SetAgentRequest.newBuilder().build();
-   *   ApiFuture&lt;Agent&gt; future = agentsClient.setAgentCallable().futureCall(request);
-   *   // Do something
-   *   Agent response = future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
-    return stub.setAgentCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   DeleteAgentRequest request = DeleteAgentRequest.newBuilder().build();
-   *   agentsClient.deleteAgent(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 void deleteAgent(DeleteAgentRequest request) {
-    deleteAgentCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   DeleteAgentRequest request = DeleteAgentRequest.newBuilder().build();
-   *   ApiFuture&lt;Void&gt; future = agentsClient.deleteAgentCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
-    return stub.deleteAgentCallable();
-  }
-
   @Override
   public final void close() {
     stub.close();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java
index 01baf842900f..bb4f0c4167df 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/AgentsSettings.java
@@ -51,13 +51,13 @@
  *
  * <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. For
- * example, to set the total timeout of getAgent to 30 seconds:
+ * example, to set the total timeout of setAgent to 30 seconds:
  *
  * <pre>
  * <code>
  * AgentsSettings.Builder agentsSettingsBuilder =
  *     AgentsSettings.newBuilder();
- * agentsSettingsBuilder.getAgentSettings().getRetrySettings().toBuilder()
+ * agentsSettingsBuilder.setAgentSettings().getRetrySettings().toBuilder()
  *     .setTotalTimeout(Duration.ofSeconds(30));
  * AgentsSettings agentsSettings = agentsSettingsBuilder.build();
  * </code>
@@ -66,6 +66,16 @@
 @Generated("by gapic-generator")
 @BetaApi
 public class AgentsSettings extends ClientSettings<AgentsSettings> {
+  /** Returns the object with the settings used for calls to setAgent. */
+  public UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings() {
+    return ((AgentsStubSettings) getStubSettings()).setAgentSettings();
+  }
+
+  /** Returns the object with the settings used for calls to deleteAgent. */
+  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();
@@ -126,16 +136,6 @@ public OperationCallSettings<RestoreAgentRequest, Empty, Struct> restoreAgentOpe
     return ((AgentsStubSettings) getStubSettings()).restoreAgentOperationSettings();
   }
 
-  /** Returns the object with the settings used for calls to setAgent. */
-  public UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings() {
-    return ((AgentsStubSettings) getStubSettings()).setAgentSettings();
-  }
-
-  /** Returns the object with the settings used for calls to deleteAgent. */
-  public UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings() {
-    return ((AgentsStubSettings) getStubSettings()).deleteAgentSettings();
-  }
-
   public static final AgentsSettings create(AgentsStubSettings stub) throws IOException {
     return new AgentsSettings.Builder(stub.toBuilder()).build();
   }
@@ -232,6 +232,16 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
+    /** Returns the builder for the settings used for calls to setAgent. */
+    public UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings() {
+      return getStubSettingsBuilder().setAgentSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to deleteAgent. */
+    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();
@@ -296,16 +306,6 @@ public UnaryCallSettings.Builder<RestoreAgentRequest, Operation> restoreAgentSet
       return getStubSettingsBuilder().restoreAgentOperationSettings();
     }
 
-    /** Returns the builder for the settings used for calls to setAgent. */
-    public UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings() {
-      return getStubSettingsBuilder().setAgentSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to deleteAgent. */
-    public UnaryCallSettings.Builder<DeleteAgentRequest, Empty> deleteAgentSettings() {
-      return getStubSettingsBuilder().deleteAgentSettings();
-    }
-
     @Override
     public AgentsSettings build() throws IOException {
       return new AgentsSettings(this);
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java
index 7ede29fa95e1..b1df9cb8c15d 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/package-info.java
@@ -51,8 +51,8 @@
  * <pre>
  * <code>
  * try (AgentsClient agentsClient = AgentsClient.create()) {
- *   ProjectName parent = ProjectName.of("[PROJECT]");
- *   Agent response = agentsClient.getAgent(parent);
+ *   Agent agent = Agent.newBuilder().build();
+ *   Agent response = agentsClient.setAgent(agent);
  * }
  * </code>
  * </pre>
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java
index 14b393690434..77bccdce22b5 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStub.java
@@ -53,6 +53,14 @@ public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
 
+  public UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
+    throw new UnsupportedOperationException("Not implemented: setAgentCallable()");
+  }
+
+  public UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteAgentCallable()");
+  }
+
   public UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: getAgentCallable()");
   }
@@ -102,14 +110,6 @@ public UnaryCallable<RestoreAgentRequest, Operation> restoreAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: restoreAgentCallable()");
   }
 
-  public UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
-    throw new UnsupportedOperationException("Not implemented: setAgentCallable()");
-  }
-
-  public UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteAgentCallable()");
-  }
-
   @Override
   public abstract void close();
 }
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
index 708decae7446..6fbd5b3471fc 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/AgentsStubSettings.java
@@ -80,13 +80,13 @@
  *
  * <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. For
- * example, to set the total timeout of getAgent to 30 seconds:
+ * example, to set the total timeout of setAgent to 30 seconds:
  *
  * <pre>
  * <code>
  * AgentsStubSettings.Builder agentsSettingsBuilder =
  *     AgentsStubSettings.newBuilder();
- * agentsSettingsBuilder.getAgentSettings().getRetrySettings().toBuilder()
+ * agentsSettingsBuilder.setAgentSettings().getRetrySettings().toBuilder()
  *     .setTotalTimeout(Duration.ofSeconds(30));
  * AgentsStubSettings agentsSettings = agentsSettingsBuilder.build();
  * </code>
@@ -102,6 +102,8 @@ public class AgentsStubSettings extends StubSettings<AgentsStubSettings> {
           .add("https://www.googleapis.com/auth/dialogflow")
           .build();
 
+  private final UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings;
+  private final UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings;
   private final UnaryCallSettings<GetAgentRequest, Agent> getAgentSettings;
   private final PagedCallSettings<
           SearchAgentsRequest, SearchAgentsResponse, SearchAgentsPagedResponse>
@@ -117,8 +119,16 @@ public class AgentsStubSettings extends StubSettings<AgentsStubSettings> {
   private final UnaryCallSettings<RestoreAgentRequest, Operation> restoreAgentSettings;
   private final OperationCallSettings<RestoreAgentRequest, Empty, Struct>
       restoreAgentOperationSettings;
-  private final UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings;
-  private final UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings;
+
+  /** Returns the object with the settings used for calls to setAgent. */
+  public UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings() {
+    return setAgentSettings;
+  }
+
+  /** Returns the object with the settings used for calls to deleteAgent. */
+  public UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings() {
+    return deleteAgentSettings;
+  }
 
   /** Returns the object with the settings used for calls to getAgent. */
   public UnaryCallSettings<GetAgentRequest, Agent> getAgentSettings() {
@@ -176,16 +186,6 @@ public OperationCallSettings<RestoreAgentRequest, Empty, Struct> restoreAgentOpe
     return restoreAgentOperationSettings;
   }
 
-  /** Returns the object with the settings used for calls to setAgent. */
-  public UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings() {
-    return setAgentSettings;
-  }
-
-  /** Returns the object with the settings used for calls to deleteAgent. */
-  public UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings() {
-    return deleteAgentSettings;
-  }
-
   @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public AgentsStub createStub() throws IOException {
     if (getTransportChannelProvider()
@@ -253,6 +253,8 @@ public Builder toBuilder() {
   protected AgentsStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
+    setAgentSettings = settingsBuilder.setAgentSettings().build();
+    deleteAgentSettings = settingsBuilder.deleteAgentSettings().build();
     getAgentSettings = settingsBuilder.getAgentSettings().build();
     searchAgentsSettings = settingsBuilder.searchAgentsSettings().build();
     trainAgentSettings = settingsBuilder.trainAgentSettings().build();
@@ -263,8 +265,6 @@ protected AgentsStubSettings(Builder settingsBuilder) throws IOException {
     importAgentOperationSettings = settingsBuilder.importAgentOperationSettings().build();
     restoreAgentSettings = settingsBuilder.restoreAgentSettings().build();
     restoreAgentOperationSettings = settingsBuilder.restoreAgentOperationSettings().build();
-    setAgentSettings = settingsBuilder.setAgentSettings().build();
-    deleteAgentSettings = settingsBuilder.deleteAgentSettings().build();
   }
 
   private static final PagedListDescriptor<SearchAgentsRequest, SearchAgentsResponse, Agent>
@@ -324,6 +324,8 @@ public ApiFuture<SearchAgentsPagedResponse> getFuturePagedResponse(
   public static class Builder extends StubSettings.Builder<AgentsStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
 
+    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>
@@ -340,8 +342,6 @@ public static class Builder extends StubSettings.Builder<AgentsStubSettings, Bui
     private final UnaryCallSettings.Builder<RestoreAgentRequest, Operation> restoreAgentSettings;
     private final OperationCallSettings.Builder<RestoreAgentRequest, Empty, Struct>
         restoreAgentOperationSettings;
-    private final UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings;
-    private final UnaryCallSettings.Builder<DeleteAgentRequest, Empty> deleteAgentSettings;
 
     private static final ImmutableMap<String, ImmutableSet<StatusCode.Code>>
         RETRYABLE_CODE_DEFINITIONS;
@@ -384,6 +384,10 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
+      setAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      deleteAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       getAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       searchAgentsSettings = PagedCallSettings.newBuilder(SEARCH_AGENTS_PAGE_STR_FACT);
@@ -404,20 +408,16 @@ protected Builder(ClientContext clientContext) {
 
       restoreAgentOperationSettings = OperationCallSettings.newBuilder();
 
-      setAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      deleteAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
+              setAgentSettings,
+              deleteAgentSettings,
               getAgentSettings,
               searchAgentsSettings,
               trainAgentSettings,
               exportAgentSettings,
               importAgentSettings,
-              restoreAgentSettings,
-              setAgentSettings,
-              deleteAgentSettings);
+              restoreAgentSettings);
 
       initDefaults(this);
     }
@@ -434,43 +434,43 @@ private static Builder createDefault() {
     private static Builder initDefaults(Builder builder) {
 
       builder
-          .getAgentSettings()
+          .setAgentSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .searchAgentsSettings()
+          .deleteAgentSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .trainAgentSettings()
+          .getAgentSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .exportAgentSettings()
+          .searchAgentsSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .importAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .trainAgentSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .restoreAgentSettings()
+          .exportAgentSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .setAgentSettings()
+          .importAgentSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .deleteAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .restoreAgentSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
       builder
           .trainAgentOperationSettings()
@@ -568,6 +568,8 @@ private static Builder initDefaults(Builder builder) {
     protected Builder(AgentsStubSettings settings) {
       super(settings);
 
+      setAgentSettings = settings.setAgentSettings.toBuilder();
+      deleteAgentSettings = settings.deleteAgentSettings.toBuilder();
       getAgentSettings = settings.getAgentSettings.toBuilder();
       searchAgentsSettings = settings.searchAgentsSettings.toBuilder();
       trainAgentSettings = settings.trainAgentSettings.toBuilder();
@@ -578,19 +580,17 @@ protected Builder(AgentsStubSettings settings) {
       importAgentOperationSettings = settings.importAgentOperationSettings.toBuilder();
       restoreAgentSettings = settings.restoreAgentSettings.toBuilder();
       restoreAgentOperationSettings = settings.restoreAgentOperationSettings.toBuilder();
-      setAgentSettings = settings.setAgentSettings.toBuilder();
-      deleteAgentSettings = settings.deleteAgentSettings.toBuilder();
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
+              setAgentSettings,
+              deleteAgentSettings,
               getAgentSettings,
               searchAgentsSettings,
               trainAgentSettings,
               exportAgentSettings,
               importAgentSettings,
-              restoreAgentSettings,
-              setAgentSettings,
-              deleteAgentSettings);
+              restoreAgentSettings);
     }
 
     // NEXT_MAJOR_VER: remove 'throws Exception'
@@ -609,6 +609,16 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
+    /** Returns the builder for the settings used for calls to setAgent. */
+    public UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings() {
+      return setAgentSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to deleteAgent. */
+    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;
@@ -673,16 +683,6 @@ public UnaryCallSettings.Builder<RestoreAgentRequest, Operation> restoreAgentSet
       return restoreAgentOperationSettings;
     }
 
-    /** Returns the builder for the settings used for calls to setAgent. */
-    public UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings() {
-      return setAgentSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to deleteAgent. */
-    public UnaryCallSettings.Builder<DeleteAgentRequest, Empty> deleteAgentSettings() {
-      return deleteAgentSettings;
-    }
-
     @Override
     public AgentsStubSettings build() throws IOException {
       return new AgentsStubSettings(this);
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java
index b3732fe25fa9..dbb0b4746d95 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2/stub/GrpcAgentsStub.java
@@ -59,6 +59,20 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public class GrpcAgentsStub extends AgentsStub {
 
+  private static final MethodDescriptor<SetAgentRequest, Agent> setAgentMethodDescriptor =
+      MethodDescriptor.<SetAgentRequest, Agent>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.dialogflow.v2.Agents/SetAgent")
+          .setRequestMarshaller(ProtoUtils.marshaller(SetAgentRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Agent.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor<DeleteAgentRequest, Empty> deleteAgentMethodDescriptor =
+      MethodDescriptor.<DeleteAgentRequest, Empty>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.dialogflow.v2.Agents/DeleteAgent")
+          .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)
@@ -104,24 +118,12 @@ public class GrpcAgentsStub extends AgentsStub {
               .setRequestMarshaller(ProtoUtils.marshaller(RestoreAgentRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
               .build();
-  private static final MethodDescriptor<SetAgentRequest, Agent> setAgentMethodDescriptor =
-      MethodDescriptor.<SetAgentRequest, Agent>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.dialogflow.v2.Agents/SetAgent")
-          .setRequestMarshaller(ProtoUtils.marshaller(SetAgentRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Agent.getDefaultInstance()))
-          .build();
-  private static final MethodDescriptor<DeleteAgentRequest, Empty> deleteAgentMethodDescriptor =
-      MethodDescriptor.<DeleteAgentRequest, Empty>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.dialogflow.v2.Agents/DeleteAgent")
-          .setRequestMarshaller(ProtoUtils.marshaller(DeleteAgentRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-          .build();
 
   private final BackgroundResource backgroundResources;
   private final GrpcOperationsStub operationsStub;
 
+  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>
@@ -135,8 +137,6 @@ public class GrpcAgentsStub extends AgentsStub {
   private final OperationCallable<ImportAgentRequest, Empty, Struct> importAgentOperationCallable;
   private final UnaryCallable<RestoreAgentRequest, Operation> restoreAgentCallable;
   private final OperationCallable<RestoreAgentRequest, Empty, Struct> restoreAgentOperationCallable;
-  private final UnaryCallable<SetAgentRequest, Agent> setAgentCallable;
-  private final UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable;
 
   private final GrpcStubCallableFactory callableFactory;
 
@@ -175,6 +175,32 @@ protected GrpcAgentsStub(
     this.callableFactory = callableFactory;
     this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory);
 
+    GrpcCallSettings<SetAgentRequest, Agent> setAgentTransportSettings =
+        GrpcCallSettings.<SetAgentRequest, Agent>newBuilder()
+            .setMethodDescriptor(setAgentMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<SetAgentRequest>() {
+                  @Override
+                  public Map<String, String> extract(SetAgentRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("agent.parent", String.valueOf(request.getAgent().getParent()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings<DeleteAgentRequest, Empty> deleteAgentTransportSettings =
+        GrpcCallSettings.<DeleteAgentRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteAgentMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<DeleteAgentRequest>() {
+                  @Override
+                  public Map<String, String> extract(DeleteAgentRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("parent", String.valueOf(request.getParent()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings<GetAgentRequest, Agent> getAgentTransportSettings =
         GrpcCallSettings.<GetAgentRequest, Agent>newBuilder()
             .setMethodDescriptor(getAgentMethodDescriptor)
@@ -253,33 +279,13 @@ public Map<String, String> extract(RestoreAgentRequest request) {
                   }
                 })
             .build();
-    GrpcCallSettings<SetAgentRequest, Agent> setAgentTransportSettings =
-        GrpcCallSettings.<SetAgentRequest, Agent>newBuilder()
-            .setMethodDescriptor(setAgentMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<SetAgentRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetAgentRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("agent.parent", String.valueOf(request.getAgent().getParent()));
-                    return params.build();
-                  }
-                })
-            .build();
-    GrpcCallSettings<DeleteAgentRequest, Empty> deleteAgentTransportSettings =
-        GrpcCallSettings.<DeleteAgentRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteAgentMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteAgentRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteAgentRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
-                })
-            .build();
 
+    this.setAgentCallable =
+        callableFactory.createUnaryCallable(
+            setAgentTransportSettings, settings.setAgentSettings(), clientContext);
+    this.deleteAgentCallable =
+        callableFactory.createUnaryCallable(
+            deleteAgentTransportSettings, settings.deleteAgentSettings(), clientContext);
     this.getAgentCallable =
         callableFactory.createUnaryCallable(
             getAgentTransportSettings, settings.getAgentSettings(), clientContext);
@@ -325,12 +331,6 @@ public Map<String, String> extract(DeleteAgentRequest request) {
             settings.restoreAgentOperationSettings(),
             clientContext,
             this.operationsStub);
-    this.setAgentCallable =
-        callableFactory.createUnaryCallable(
-            setAgentTransportSettings, settings.setAgentSettings(), clientContext);
-    this.deleteAgentCallable =
-        callableFactory.createUnaryCallable(
-            deleteAgentTransportSettings, settings.deleteAgentSettings(), clientContext);
 
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
@@ -340,6 +340,14 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  public UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
+    return setAgentCallable;
+  }
+
+  public UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
+    return deleteAgentCallable;
+  }
+
   public UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
     return getAgentCallable;
   }
@@ -389,14 +397,6 @@ public UnaryCallable<RestoreAgentRequest, Operation> restoreAgentCallable() {
     return restoreAgentCallable;
   }
 
-  public UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
-    return setAgentCallable;
-  }
-
-  public UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
-    return deleteAgentCallable;
-  }
-
   @Override
   public final void close() {
     shutdown();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
index d4d0a067f6f9..0b4d83fd6fd5 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsClient.java
@@ -72,8 +72,8 @@
  * <pre>
  * <code>
  * try (AgentsClient agentsClient = AgentsClient.create()) {
- *   ProjectName parent = ProjectName.of("[PROJECT]");
- *   Agent response = agentsClient.getAgent(parent);
+ *   Agent agent = Agent.newBuilder().build();
+ *   Agent response = agentsClient.setAgent(agent);
  * }
  * </code>
  * </pre>
@@ -193,6 +193,167 @@ public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates/updates the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   Agent agent = Agent.newBuilder().build();
+   *   Agent response = agentsClient.setAgent(agent);
+   * }
+   * </code></pre>
+   *
+   * @param agent Required. The agent to update.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final Agent setAgent(Agent agent) {
+
+    SetAgentRequest request = SetAgentRequest.newBuilder().setAgent(agent).build();
+    return setAgent(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates/updates the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   Agent agent = Agent.newBuilder().build();
+   *   SetAgentRequest request = SetAgentRequest.newBuilder()
+   *     .setAgent(agent)
+   *     .build();
+   *   Agent response = agentsClient.setAgent(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 setAgent(SetAgentRequest request) {
+    return setAgentCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Creates/updates the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   Agent agent = Agent.newBuilder().build();
+   *   SetAgentRequest request = SetAgentRequest.newBuilder()
+   *     .setAgent(agent)
+   *     .build();
+   *   ApiFuture&lt;Agent&gt; future = agentsClient.setAgentCallable().futureCall(request);
+   *   // Do something
+   *   Agent response = future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
+    return stub.setAgentCallable();
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   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(ProjectName parent) {
+
+    DeleteAgentRequest request =
+        DeleteAgentRequest.newBuilder()
+            .setParent(parent == null ? null : parent.toString())
+            .build();
+    deleteAgent(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   agentsClient.deleteAgent(parent.toString());
+   * }
+   * </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(String parent) {
+
+    DeleteAgentRequest request = DeleteAgentRequest.newBuilder().setParent(parent).build();
+    deleteAgent(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   DeleteAgentRequest request = DeleteAgentRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   agentsClient.deleteAgent(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 void deleteAgent(DeleteAgentRequest request) {
+    deleteAgentCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified agent.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (AgentsClient agentsClient = AgentsClient.create()) {
+   *   ProjectName parent = ProjectName.of("[PROJECT]");
+   *   DeleteAgentRequest request = DeleteAgentRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = agentsClient.deleteAgentCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
+    return stub.deleteAgentCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Retrieves the specified agent.
@@ -884,84 +1045,6 @@ public final UnaryCallable<RestoreAgentRequest, Operation> restoreAgentCallable(
     return stub.restoreAgentCallable();
   }
 
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Creates/updates the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   SetAgentRequest request = SetAgentRequest.newBuilder().build();
-   *   Agent response = agentsClient.setAgent(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 setAgent(SetAgentRequest request) {
-    return setAgentCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Creates/updates the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   SetAgentRequest request = SetAgentRequest.newBuilder().build();
-   *   ApiFuture&lt;Agent&gt; future = agentsClient.setAgentCallable().futureCall(request);
-   *   // Do something
-   *   Agent response = future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
-    return stub.setAgentCallable();
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   DeleteAgentRequest request = DeleteAgentRequest.newBuilder().build();
-   *   agentsClient.deleteAgent(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 void deleteAgent(DeleteAgentRequest request) {
-    deleteAgentCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified agent.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (AgentsClient agentsClient = AgentsClient.create()) {
-   *   DeleteAgentRequest request = DeleteAgentRequest.newBuilder().build();
-   *   ApiFuture&lt;Void&gt; future = agentsClient.deleteAgentCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
-    return stub.deleteAgentCallable();
-  }
-
   @Override
   public final void close() {
     stub.close();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
index 3324f8b55204..a1543dde49bc 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/AgentsSettings.java
@@ -51,13 +51,13 @@
  *
  * <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. For
- * example, to set the total timeout of getAgent to 30 seconds:
+ * example, to set the total timeout of setAgent to 30 seconds:
  *
  * <pre>
  * <code>
  * AgentsSettings.Builder agentsSettingsBuilder =
  *     AgentsSettings.newBuilder();
- * agentsSettingsBuilder.getAgentSettings().getRetrySettings().toBuilder()
+ * agentsSettingsBuilder.setAgentSettings().getRetrySettings().toBuilder()
  *     .setTotalTimeout(Duration.ofSeconds(30));
  * AgentsSettings agentsSettings = agentsSettingsBuilder.build();
  * </code>
@@ -66,6 +66,16 @@
 @Generated("by gapic-generator")
 @BetaApi
 public class AgentsSettings extends ClientSettings<AgentsSettings> {
+  /** Returns the object with the settings used for calls to setAgent. */
+  public UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings() {
+    return ((AgentsStubSettings) getStubSettings()).setAgentSettings();
+  }
+
+  /** Returns the object with the settings used for calls to deleteAgent. */
+  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();
@@ -126,16 +136,6 @@ public OperationCallSettings<RestoreAgentRequest, Empty, Struct> restoreAgentOpe
     return ((AgentsStubSettings) getStubSettings()).restoreAgentOperationSettings();
   }
 
-  /** Returns the object with the settings used for calls to setAgent. */
-  public UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings() {
-    return ((AgentsStubSettings) getStubSettings()).setAgentSettings();
-  }
-
-  /** Returns the object with the settings used for calls to deleteAgent. */
-  public UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings() {
-    return ((AgentsStubSettings) getStubSettings()).deleteAgentSettings();
-  }
-
   public static final AgentsSettings create(AgentsStubSettings stub) throws IOException {
     return new AgentsSettings.Builder(stub.toBuilder()).build();
   }
@@ -232,6 +232,16 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
+    /** Returns the builder for the settings used for calls to setAgent. */
+    public UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings() {
+      return getStubSettingsBuilder().setAgentSettings();
+    }
+
+    /** Returns the builder for the settings used for calls to deleteAgent. */
+    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();
@@ -296,16 +306,6 @@ public UnaryCallSettings.Builder<RestoreAgentRequest, Operation> restoreAgentSet
       return getStubSettingsBuilder().restoreAgentOperationSettings();
     }
 
-    /** Returns the builder for the settings used for calls to setAgent. */
-    public UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings() {
-      return getStubSettingsBuilder().setAgentSettings();
-    }
-
-    /** Returns the builder for the settings used for calls to deleteAgent. */
-    public UnaryCallSettings.Builder<DeleteAgentRequest, Empty> deleteAgentSettings() {
-      return getStubSettingsBuilder().deleteAgentSettings();
-    }
-
     @Override
     public AgentsSettings build() throws IOException {
       return new AgentsSettings(this);
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java
index cea2b3d54a8d..19b970f4b380 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/package-info.java
@@ -51,8 +51,8 @@
  * <pre>
  * <code>
  * try (AgentsClient agentsClient = AgentsClient.create()) {
- *   ProjectName parent = ProjectName.of("[PROJECT]");
- *   Agent response = agentsClient.getAgent(parent);
+ *   Agent agent = Agent.newBuilder().build();
+ *   Agent response = agentsClient.setAgent(agent);
  * }
  * </code>
  * </pre>
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
index ae53efeebafa..20b39313ecec 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStub.java
@@ -53,6 +53,14 @@ public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
 
+  public UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
+    throw new UnsupportedOperationException("Not implemented: setAgentCallable()");
+  }
+
+  public UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteAgentCallable()");
+  }
+
   public UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: getAgentCallable()");
   }
@@ -102,14 +110,6 @@ public UnaryCallable<RestoreAgentRequest, Operation> restoreAgentCallable() {
     throw new UnsupportedOperationException("Not implemented: restoreAgentCallable()");
   }
 
-  public UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
-    throw new UnsupportedOperationException("Not implemented: setAgentCallable()");
-  }
-
-  public UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteAgentCallable()");
-  }
-
   @Override
   public abstract void close();
 }
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
index 66bef8cf8a4d..244f7e32d087 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/AgentsStubSettings.java
@@ -80,13 +80,13 @@
  *
  * <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. For
- * example, to set the total timeout of getAgent to 30 seconds:
+ * example, to set the total timeout of setAgent to 30 seconds:
  *
  * <pre>
  * <code>
  * AgentsStubSettings.Builder agentsSettingsBuilder =
  *     AgentsStubSettings.newBuilder();
- * agentsSettingsBuilder.getAgentSettings().getRetrySettings().toBuilder()
+ * agentsSettingsBuilder.setAgentSettings().getRetrySettings().toBuilder()
  *     .setTotalTimeout(Duration.ofSeconds(30));
  * AgentsStubSettings agentsSettings = agentsSettingsBuilder.build();
  * </code>
@@ -102,6 +102,8 @@ public class AgentsStubSettings extends StubSettings<AgentsStubSettings> {
           .add("https://www.googleapis.com/auth/dialogflow")
           .build();
 
+  private final UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings;
+  private final UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings;
   private final UnaryCallSettings<GetAgentRequest, Agent> getAgentSettings;
   private final PagedCallSettings<
           SearchAgentsRequest, SearchAgentsResponse, SearchAgentsPagedResponse>
@@ -117,8 +119,16 @@ public class AgentsStubSettings extends StubSettings<AgentsStubSettings> {
   private final UnaryCallSettings<RestoreAgentRequest, Operation> restoreAgentSettings;
   private final OperationCallSettings<RestoreAgentRequest, Empty, Struct>
       restoreAgentOperationSettings;
-  private final UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings;
-  private final UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings;
+
+  /** Returns the object with the settings used for calls to setAgent. */
+  public UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings() {
+    return setAgentSettings;
+  }
+
+  /** Returns the object with the settings used for calls to deleteAgent. */
+  public UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings() {
+    return deleteAgentSettings;
+  }
 
   /** Returns the object with the settings used for calls to getAgent. */
   public UnaryCallSettings<GetAgentRequest, Agent> getAgentSettings() {
@@ -176,16 +186,6 @@ public OperationCallSettings<RestoreAgentRequest, Empty, Struct> restoreAgentOpe
     return restoreAgentOperationSettings;
   }
 
-  /** Returns the object with the settings used for calls to setAgent. */
-  public UnaryCallSettings<SetAgentRequest, Agent> setAgentSettings() {
-    return setAgentSettings;
-  }
-
-  /** Returns the object with the settings used for calls to deleteAgent. */
-  public UnaryCallSettings<DeleteAgentRequest, Empty> deleteAgentSettings() {
-    return deleteAgentSettings;
-  }
-
   @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public AgentsStub createStub() throws IOException {
     if (getTransportChannelProvider()
@@ -253,6 +253,8 @@ public Builder toBuilder() {
   protected AgentsStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
+    setAgentSettings = settingsBuilder.setAgentSettings().build();
+    deleteAgentSettings = settingsBuilder.deleteAgentSettings().build();
     getAgentSettings = settingsBuilder.getAgentSettings().build();
     searchAgentsSettings = settingsBuilder.searchAgentsSettings().build();
     trainAgentSettings = settingsBuilder.trainAgentSettings().build();
@@ -263,8 +265,6 @@ protected AgentsStubSettings(Builder settingsBuilder) throws IOException {
     importAgentOperationSettings = settingsBuilder.importAgentOperationSettings().build();
     restoreAgentSettings = settingsBuilder.restoreAgentSettings().build();
     restoreAgentOperationSettings = settingsBuilder.restoreAgentOperationSettings().build();
-    setAgentSettings = settingsBuilder.setAgentSettings().build();
-    deleteAgentSettings = settingsBuilder.deleteAgentSettings().build();
   }
 
   private static final PagedListDescriptor<SearchAgentsRequest, SearchAgentsResponse, Agent>
@@ -324,6 +324,8 @@ public ApiFuture<SearchAgentsPagedResponse> getFuturePagedResponse(
   public static class Builder extends StubSettings.Builder<AgentsStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
 
+    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>
@@ -340,8 +342,6 @@ public static class Builder extends StubSettings.Builder<AgentsStubSettings, Bui
     private final UnaryCallSettings.Builder<RestoreAgentRequest, Operation> restoreAgentSettings;
     private final OperationCallSettings.Builder<RestoreAgentRequest, Empty, Struct>
         restoreAgentOperationSettings;
-    private final UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings;
-    private final UnaryCallSettings.Builder<DeleteAgentRequest, Empty> deleteAgentSettings;
 
     private static final ImmutableMap<String, ImmutableSet<StatusCode.Code>>
         RETRYABLE_CODE_DEFINITIONS;
@@ -384,6 +384,10 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
+      setAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
+      deleteAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       getAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       searchAgentsSettings = PagedCallSettings.newBuilder(SEARCH_AGENTS_PAGE_STR_FACT);
@@ -404,20 +408,16 @@ protected Builder(ClientContext clientContext) {
 
       restoreAgentOperationSettings = OperationCallSettings.newBuilder();
 
-      setAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
-      deleteAgentSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
+              setAgentSettings,
+              deleteAgentSettings,
               getAgentSettings,
               searchAgentsSettings,
               trainAgentSettings,
               exportAgentSettings,
               importAgentSettings,
-              restoreAgentSettings,
-              setAgentSettings,
-              deleteAgentSettings);
+              restoreAgentSettings);
 
       initDefaults(this);
     }
@@ -434,43 +434,43 @@ private static Builder createDefault() {
     private static Builder initDefaults(Builder builder) {
 
       builder
-          .getAgentSettings()
+          .setAgentSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .searchAgentsSettings()
+          .deleteAgentSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .trainAgentSettings()
+          .getAgentSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .exportAgentSettings()
+          .searchAgentsSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .importAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .trainAgentSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .restoreAgentSettings()
+          .exportAgentSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .setAgentSettings()
+          .importAgentSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
 
       builder
-          .deleteAgentSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
+          .restoreAgentSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
           .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
       builder
           .trainAgentOperationSettings()
@@ -568,6 +568,8 @@ private static Builder initDefaults(Builder builder) {
     protected Builder(AgentsStubSettings settings) {
       super(settings);
 
+      setAgentSettings = settings.setAgentSettings.toBuilder();
+      deleteAgentSettings = settings.deleteAgentSettings.toBuilder();
       getAgentSettings = settings.getAgentSettings.toBuilder();
       searchAgentsSettings = settings.searchAgentsSettings.toBuilder();
       trainAgentSettings = settings.trainAgentSettings.toBuilder();
@@ -578,19 +580,17 @@ protected Builder(AgentsStubSettings settings) {
       importAgentOperationSettings = settings.importAgentOperationSettings.toBuilder();
       restoreAgentSettings = settings.restoreAgentSettings.toBuilder();
       restoreAgentOperationSettings = settings.restoreAgentOperationSettings.toBuilder();
-      setAgentSettings = settings.setAgentSettings.toBuilder();
-      deleteAgentSettings = settings.deleteAgentSettings.toBuilder();
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
+              setAgentSettings,
+              deleteAgentSettings,
               getAgentSettings,
               searchAgentsSettings,
               trainAgentSettings,
               exportAgentSettings,
               importAgentSettings,
-              restoreAgentSettings,
-              setAgentSettings,
-              deleteAgentSettings);
+              restoreAgentSettings);
     }
 
     // NEXT_MAJOR_VER: remove 'throws Exception'
@@ -609,6 +609,16 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
+    /** Returns the builder for the settings used for calls to setAgent. */
+    public UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings() {
+      return setAgentSettings;
+    }
+
+    /** Returns the builder for the settings used for calls to deleteAgent. */
+    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;
@@ -673,16 +683,6 @@ public UnaryCallSettings.Builder<RestoreAgentRequest, Operation> restoreAgentSet
       return restoreAgentOperationSettings;
     }
 
-    /** Returns the builder for the settings used for calls to setAgent. */
-    public UnaryCallSettings.Builder<SetAgentRequest, Agent> setAgentSettings() {
-      return setAgentSettings;
-    }
-
-    /** Returns the builder for the settings used for calls to deleteAgent. */
-    public UnaryCallSettings.Builder<DeleteAgentRequest, Empty> deleteAgentSettings() {
-      return deleteAgentSettings;
-    }
-
     @Override
     public AgentsStubSettings build() throws IOException {
       return new AgentsStubSettings(this);
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
index 53864faa97b0..1c00400fdb3f 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/main/java/com/google/cloud/dialogflow/v2beta1/stub/GrpcAgentsStub.java
@@ -59,6 +59,20 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public class GrpcAgentsStub extends AgentsStub {
 
+  private static final MethodDescriptor<SetAgentRequest, Agent> setAgentMethodDescriptor =
+      MethodDescriptor.<SetAgentRequest, Agent>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.dialogflow.v2beta1.Agents/SetAgent")
+          .setRequestMarshaller(ProtoUtils.marshaller(SetAgentRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Agent.getDefaultInstance()))
+          .build();
+  private static final MethodDescriptor<DeleteAgentRequest, Empty> deleteAgentMethodDescriptor =
+      MethodDescriptor.<DeleteAgentRequest, Empty>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.dialogflow.v2beta1.Agents/DeleteAgent")
+          .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)
@@ -104,24 +118,12 @@ public class GrpcAgentsStub extends AgentsStub {
               .setRequestMarshaller(ProtoUtils.marshaller(RestoreAgentRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
               .build();
-  private static final MethodDescriptor<SetAgentRequest, Agent> setAgentMethodDescriptor =
-      MethodDescriptor.<SetAgentRequest, Agent>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.dialogflow.v2beta1.Agents/SetAgent")
-          .setRequestMarshaller(ProtoUtils.marshaller(SetAgentRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Agent.getDefaultInstance()))
-          .build();
-  private static final MethodDescriptor<DeleteAgentRequest, Empty> deleteAgentMethodDescriptor =
-      MethodDescriptor.<DeleteAgentRequest, Empty>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.dialogflow.v2beta1.Agents/DeleteAgent")
-          .setRequestMarshaller(ProtoUtils.marshaller(DeleteAgentRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-          .build();
 
   private final BackgroundResource backgroundResources;
   private final GrpcOperationsStub operationsStub;
 
+  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>
@@ -135,8 +137,6 @@ public class GrpcAgentsStub extends AgentsStub {
   private final OperationCallable<ImportAgentRequest, Empty, Struct> importAgentOperationCallable;
   private final UnaryCallable<RestoreAgentRequest, Operation> restoreAgentCallable;
   private final OperationCallable<RestoreAgentRequest, Empty, Struct> restoreAgentOperationCallable;
-  private final UnaryCallable<SetAgentRequest, Agent> setAgentCallable;
-  private final UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable;
 
   private final GrpcStubCallableFactory callableFactory;
 
@@ -175,6 +175,32 @@ protected GrpcAgentsStub(
     this.callableFactory = callableFactory;
     this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory);
 
+    GrpcCallSettings<SetAgentRequest, Agent> setAgentTransportSettings =
+        GrpcCallSettings.<SetAgentRequest, Agent>newBuilder()
+            .setMethodDescriptor(setAgentMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<SetAgentRequest>() {
+                  @Override
+                  public Map<String, String> extract(SetAgentRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("agent.parent", String.valueOf(request.getAgent().getParent()));
+                    return params.build();
+                  }
+                })
+            .build();
+    GrpcCallSettings<DeleteAgentRequest, Empty> deleteAgentTransportSettings =
+        GrpcCallSettings.<DeleteAgentRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteAgentMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<DeleteAgentRequest>() {
+                  @Override
+                  public Map<String, String> extract(DeleteAgentRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("parent", String.valueOf(request.getParent()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings<GetAgentRequest, Agent> getAgentTransportSettings =
         GrpcCallSettings.<GetAgentRequest, Agent>newBuilder()
             .setMethodDescriptor(getAgentMethodDescriptor)
@@ -253,33 +279,13 @@ public Map<String, String> extract(RestoreAgentRequest request) {
                   }
                 })
             .build();
-    GrpcCallSettings<SetAgentRequest, Agent> setAgentTransportSettings =
-        GrpcCallSettings.<SetAgentRequest, Agent>newBuilder()
-            .setMethodDescriptor(setAgentMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<SetAgentRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetAgentRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("agent.parent", String.valueOf(request.getAgent().getParent()));
-                    return params.build();
-                  }
-                })
-            .build();
-    GrpcCallSettings<DeleteAgentRequest, Empty> deleteAgentTransportSettings =
-        GrpcCallSettings.<DeleteAgentRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteAgentMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteAgentRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteAgentRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
-                })
-            .build();
 
+    this.setAgentCallable =
+        callableFactory.createUnaryCallable(
+            setAgentTransportSettings, settings.setAgentSettings(), clientContext);
+    this.deleteAgentCallable =
+        callableFactory.createUnaryCallable(
+            deleteAgentTransportSettings, settings.deleteAgentSettings(), clientContext);
     this.getAgentCallable =
         callableFactory.createUnaryCallable(
             getAgentTransportSettings, settings.getAgentSettings(), clientContext);
@@ -325,12 +331,6 @@ public Map<String, String> extract(DeleteAgentRequest request) {
             settings.restoreAgentOperationSettings(),
             clientContext,
             this.operationsStub);
-    this.setAgentCallable =
-        callableFactory.createUnaryCallable(
-            setAgentTransportSettings, settings.setAgentSettings(), clientContext);
-    this.deleteAgentCallable =
-        callableFactory.createUnaryCallable(
-            deleteAgentTransportSettings, settings.deleteAgentSettings(), clientContext);
 
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
@@ -340,6 +340,14 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  public UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
+    return setAgentCallable;
+  }
+
+  public UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
+    return deleteAgentCallable;
+  }
+
   public UnaryCallable<GetAgentRequest, Agent> getAgentCallable() {
     return getAgentCallable;
   }
@@ -389,14 +397,6 @@ public UnaryCallable<RestoreAgentRequest, Operation> restoreAgentCallable() {
     return restoreAgentCallable;
   }
 
-  public UnaryCallable<SetAgentRequest, Agent> setAgentCallable() {
-    return setAgentCallable;
-  }
-
-  public UnaryCallable<DeleteAgentRequest, Empty> deleteAgentCallable() {
-    return deleteAgentCallable;
-  }
-
   @Override
   public final void close() {
     shutdown();
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java
index 4bac7289e154..faa297928715 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2/AgentsClientTest.java
@@ -98,6 +98,99 @@ public void tearDown() throws Exception {
     client.close();
   }
 
+  @Test
+  @SuppressWarnings("all")
+  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);
+
+    Agent agent = Agent.newBuilder().build();
+
+    Agent actualResponse = client.setAgent(agent);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockAgents.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    SetAgentRequest actualRequest = (SetAgentRequest) actualRequests.get(0);
+
+    Assert.assertEquals(agent, actualRequest.getAgent());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void setAgentExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockAgents.addException(exception);
+
+    try {
+      Agent agent = Agent.newBuilder().build();
+
+      client.setAgent(agent);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteAgentTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockAgents.addResponse(expectedResponse);
+
+    ProjectName parent = ProjectName.of("[PROJECT]");
+
+    client.deleteAgent(parent);
+
+    List<AbstractMessage> actualRequests = mockAgents.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteAgentRequest actualRequest = (DeleteAgentRequest) actualRequests.get(0);
+
+    Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteAgentExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockAgents.addException(exception);
+
+    try {
+      ProjectName parent = ProjectName.of("[PROJECT]");
+
+      client.deleteAgent(parent);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void getAgentTest() {
diff --git a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java
index 70ecb8f8ad25..c91afa824e69 100644
--- a/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java
+++ b/google-cloud-clients/google-cloud-dialogflow/src/test/java/com/google/cloud/dialogflow/v2beta1/AgentsClientTest.java
@@ -104,6 +104,99 @@ public void tearDown() throws Exception {
     client.close();
   }
 
+  @Test
+  @SuppressWarnings("all")
+  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);
+
+    Agent agent = Agent.newBuilder().build();
+
+    Agent actualResponse = client.setAgent(agent);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockAgents.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    SetAgentRequest actualRequest = (SetAgentRequest) actualRequests.get(0);
+
+    Assert.assertEquals(agent, actualRequest.getAgent());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void setAgentExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockAgents.addException(exception);
+
+    try {
+      Agent agent = Agent.newBuilder().build();
+
+      client.setAgent(agent);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteAgentTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockAgents.addResponse(expectedResponse);
+
+    ProjectName parent = ProjectName.of("[PROJECT]");
+
+    client.deleteAgent(parent);
+
+    List<AbstractMessage> actualRequests = mockAgents.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteAgentRequest actualRequest = (DeleteAgentRequest) actualRequests.get(0);
+
+    Assert.assertEquals(parent, ProjectName.parse(actualRequest.getParent()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteAgentExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockAgents.addException(exception);
+
+    try {
+      ProjectName parent = ProjectName.of("[PROJECT]");
+
+      client.deleteAgent(parent);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void getAgentTest() {
diff --git a/google-cloud-clients/google-cloud-dialogflow/synth.metadata b/google-cloud-clients/google-cloud-dialogflow/synth.metadata
index c24ded359d64..aeac2cfda323 100644
--- a/google-cloud-clients/google-cloud-dialogflow/synth.metadata
+++ b/google-cloud-clients/google-cloud-dialogflow/synth.metadata
@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-06-21T07:42:03.955130Z",
+  "updateTime": "2019-07-03T17:13:09.486563Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.29.0",
-        "dockerImage": "googleapis/artman@sha256:b79c8c20ee51e5302686c9d1294672d59290df1489be93749ef17d0172cc508d"
+        "version": "0.29.3",
+        "dockerImage": "googleapis/artman@sha256:8900f94a81adaab0238965aa8a7b3648791f4f3a95ee65adc6a56cfcc3753101"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c9546320bb83441a5a49b13a22d5552eef352105",
-        "internalRef": "254331898"
+        "sha": "91d9692c20e1c038df3214a4d2d7f5d931f86905",
+        "internalRef": "256375941"
       }
     }
   ],