From 90a9033eba3cd4242cc75dddff11d60fec92b0a6 Mon Sep 17 00:00:00 2001
From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com>
Date: Fri, 19 Jan 2024 10:37:22 -0500
Subject: [PATCH] fix!: [aiplatform] Fix rpc tensorboard_service.proto
 definitions for BatchCreateTensorboardTimeSeries and
 BatchReadTensorboardTimeSeriesData (#10221)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix!: Fix rpc tensorboard_service.proto definitions for BatchCreateTensorboardTimeSeries and BatchReadTensorboardTimeSeriesData
feat: add models to CustomJobSpec
feat: add max_wait_duration to Scheduling
docs: minor changes to comments

PiperOrigin-RevId: 597666793

Source-Link: https://github.com/googleapis/googleapis/commit/84ee19ccbe01f3b4fdc8b96394a66acfceca67b9

Source-Link: https://github.com/googleapis/googleapis-gen/commit/8dc3e3e32043acd6893bed96a6b4566f00843329
Copy-Tag: eyJwIjoiamF2YS1haXBsYXRmb3JtLy5Pd2xCb3QueWFtbCIsImgiOiI4ZGMzZTNlMzIwNDNhY2Q2ODkzYmVkOTZhNmI0NTY2ZjAwODQzMzI5In0=

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix!: Fix rpc tensorboard_service.proto definitions for BatchCreateTensorboardTimeSeries and BatchReadTensorboardTimeSeriesData
feat: add models to CustomJobSpec
feat: add max_wait_duration to Scheduling
feat: add CountTokens method to llm_utility_service
docs: minor changes to comments

PiperOrigin-RevId: 597667108

Source-Link: https://github.com/googleapis/googleapis/commit/714ab03e10b34f4defb4c8bd7fe2a6b07384279f

Source-Link: https://github.com/googleapis/googleapis-gen/commit/3ff71b39d2ad2eeb5113940c5de5593da0527b26
Copy-Tag: eyJwIjoiamF2YS1haXBsYXRmb3JtLy5Pd2xCb3QueWFtbCIsImgiOiIzZmY3MWIzOWQyYWQyZWViNTExMzk0MGM1ZGU1NTkzZGEwNTI3YjI2In0=

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

---------

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
---
 java-aiplatform/README.md                     |   2 +-
 .../FeatureOnlineStoreAdminServiceClient.java |   4 +-
 .../FeatureOnlineStoreAdminServiceClient.java |   4 +-
 .../v1beta1/LlmUtilityServiceClient.java      | 157 +++++-
 .../v1beta1/LlmUtilityServiceSettings.java    |  17 +-
 .../aiplatform/v1beta1/gapic_metadata.json    |   3 +
 .../aiplatform/v1beta1/package-info.java      |   2 +-
 .../stub/GrpcLlmUtilityServiceStub.java       |  31 ++
 .../v1beta1/stub/LlmUtilityServiceStub.java   |   6 +
 .../stub/LlmUtilityServiceStubSettings.java   |  32 +-
 .../v1beta1/LlmUtilityServiceClientTest.java  |  86 ++++
 .../v1beta1/MockLlmUtilityServiceImpl.java    |  21 +
 .../v1beta1/LlmUtilityServiceGrpc.java        | 123 ++++-
 .../v1/CreateFeatureOnlineStoreRequest.java   |  14 +-
 ...ateFeatureOnlineStoreRequestOrBuilder.java |   4 +-
 .../cloud/aiplatform/v1/CustomJobProto.java   |  62 +--
 .../cloud/aiplatform/v1/CustomJobSpec.java    | 459 ++++++++++++++++++
 .../aiplatform/v1/CustomJobSpecOrBuilder.java | 107 ++++
 .../aiplatform/v1/ExportDataResponse.java     |  65 ++-
 .../v1/ExportDataResponseOrBuilder.java       |  20 +-
 .../google/cloud/aiplatform/v1/Feature.java   |  14 +-
 .../cloud/aiplatform/v1/FeatureOrBuilder.java |   4 +-
 .../cloud/aiplatform/v1/ModelEvaluation.java  |  24 +-
 .../v1/ModelEvaluationOrBuilder.java          |   6 +-
 .../cloud/aiplatform/v1/Scheduling.java       | 301 ++++++++++++
 .../aiplatform/v1/SchedulingOrBuilder.java    |  44 ++
 .../aiplatform/v1/SearchDataItemsRequest.java |  42 +-
 .../v1/SearchDataItemsRequestOrBuilder.java   |  12 +-
 .../v1/TensorboardServiceProto.java           | 186 ++++---
 .../cloud/aiplatform/v1/custom_job.proto      |  25 +
 .../cloud/aiplatform/v1/dataset_service.proto |   5 +-
 .../google/cloud/aiplatform/v1/feature.proto  |   2 +-
 .../feature_online_store_admin_service.proto  |   2 +-
 .../aiplatform/v1/model_evaluation.proto      |   2 +-
 .../aiplatform/v1/tensorboard_service.proto   |   4 +-
 .../CreateFeatureOnlineStoreRequest.java      |  14 +-
 ...ateFeatureOnlineStoreRequestOrBuilder.java |   4 +-
 .../aiplatform/v1beta1/CustomJobProto.java    |  66 +--
 .../aiplatform/v1beta1/CustomJobSpec.java     | 459 ++++++++++++++++++
 .../v1beta1/CustomJobSpecOrBuilder.java       | 107 ++++
 .../v1beta1/ExportDataResponse.java           |  65 ++-
 .../v1beta1/ExportDataResponseOrBuilder.java  |  20 +-
 .../cloud/aiplatform/v1beta1/Feature.java     |  14 +-
 .../v1beta1/FeatureOnlineStore.java           |  83 ++--
 .../aiplatform/v1beta1/FeatureOrBuilder.java  |   4 +-
 .../v1beta1/LlmUtilityServiceProto.java       |  61 ++-
 .../aiplatform/v1beta1/ModelEvaluation.java   |  24 +-
 .../v1beta1/ModelEvaluationOrBuilder.java     |   6 +-
 .../v1beta1/PersistentResource.java           |  12 +-
 .../cloud/aiplatform/v1beta1/Scheduling.java  | 301 ++++++++++++
 .../v1beta1/SchedulingOrBuilder.java          |  44 ++
 .../v1beta1/SearchDataItemsRequest.java       |  42 +-
 .../SearchDataItemsRequestOrBuilder.java      |  12 +-
 .../v1beta1/TensorboardServiceProto.java      | 196 ++++----
 .../cloud/aiplatform/v1beta1/custom_job.proto |  25 +
 .../aiplatform/v1beta1/dataset_service.proto  |   5 +-
 .../cloud/aiplatform/v1beta1/feature.proto    |   2 +-
 .../v1beta1/feature_online_store.proto        |   9 +-
 .../feature_online_store_admin_service.proto  |   2 +-
 .../v1beta1/llm_utility_service.proto         |  14 +
 .../aiplatform/v1beta1/model_evaluation.proto |   2 +-
 .../v1beta1/persistent_resource.proto         |   6 +-
 .../v1beta1/tensorboard_service.proto         |   4 +-
 .../counttokens/AsyncCountTokens.java         |  59 +++
 .../counttokens/SyncCountTokens.java          |  55 +++
 .../SyncCountTokensEndpointnameListvalue.java |  47 ++
 .../SyncCountTokensStringListvalue.java       |  48 ++
 .../SyncCountTokens.java}                     |  14 +-
 .../SyncCountTokens.java}                     |  14 +-
 69 files changed, 3180 insertions(+), 552 deletions(-)
 create mode 100644 java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/AsyncCountTokens.java
 create mode 100644 java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokens.java
 create mode 100644 java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokensEndpointnameListvalue.java
 create mode 100644 java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokensStringListvalue.java
 rename java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservicesettings/{computetokens/SyncComputeTokens.java => counttokens/SyncCountTokens.java} (88%)
 rename java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/stub/llmutilityservicestubsettings/{computetokens/SyncComputeTokens.java => counttokens/SyncCountTokens.java} (88%)

diff --git a/java-aiplatform/README.md b/java-aiplatform/README.md
index 93b7354e84b0..9c887def2946 100644
--- a/java-aiplatform/README.md
+++ b/java-aiplatform/README.md
@@ -195,7 +195,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-aiplatform.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-aiplatform/3.33.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-aiplatform/3.34.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles
diff --git a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/FeatureOnlineStoreAdminServiceClient.java b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/FeatureOnlineStoreAdminServiceClient.java
index 8ce099cf1d68..fd765c6a40a7 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/FeatureOnlineStoreAdminServiceClient.java
+++ b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1/FeatureOnlineStoreAdminServiceClient.java
@@ -540,7 +540,7 @@ public final OperationsClient getOperationsClient() {
    * }</pre>
    *
    * @param parent Required. The resource name of the Location to create FeatureOnlineStores.
-   *     Format: `projects/{project}/locations/{location}'`
+   *     Format: `projects/{project}/locations/{location}`
    * @param featureOnlineStore Required. The FeatureOnlineStore to create.
    * @param featureOnlineStoreId Required. The ID to use for this FeatureOnlineStore, which will
    *     become the final component of the FeatureOnlineStore's resource name.
@@ -586,7 +586,7 @@ public final OperationsClient getOperationsClient() {
    * }</pre>
    *
    * @param parent Required. The resource name of the Location to create FeatureOnlineStores.
-   *     Format: `projects/{project}/locations/{location}'`
+   *     Format: `projects/{project}/locations/{location}`
    * @param featureOnlineStore Required. The FeatureOnlineStore to create.
    * @param featureOnlineStoreId Required. The ID to use for this FeatureOnlineStore, which will
    *     become the final component of the FeatureOnlineStore's resource name.
diff --git a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOnlineStoreAdminServiceClient.java b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOnlineStoreAdminServiceClient.java
index d69184301f58..d751d6094930 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOnlineStoreAdminServiceClient.java
+++ b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOnlineStoreAdminServiceClient.java
@@ -542,7 +542,7 @@ public final OperationsClient getOperationsClient() {
    * }</pre>
    *
    * @param parent Required. The resource name of the Location to create FeatureOnlineStores.
-   *     Format: `projects/{project}/locations/{location}'`
+   *     Format: `projects/{project}/locations/{location}`
    * @param featureOnlineStore Required. The FeatureOnlineStore to create.
    * @param featureOnlineStoreId Required. The ID to use for this FeatureOnlineStore, which will
    *     become the final component of the FeatureOnlineStore's resource name.
@@ -588,7 +588,7 @@ public final OperationsClient getOperationsClient() {
    * }</pre>
    *
    * @param parent Required. The resource name of the Location to create FeatureOnlineStores.
-   *     Format: `projects/{project}/locations/{location}'`
+   *     Format: `projects/{project}/locations/{location}`
    * @param featureOnlineStore Required. The FeatureOnlineStore to create.
    * @param featureOnlineStoreId Required. The ID to use for this FeatureOnlineStore, which will
    *     become the final component of the FeatureOnlineStore's resource name.
diff --git a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceClient.java b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceClient.java
index 3682d4ad06d7..64675d3b6b5c 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceClient.java
+++ b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceClient.java
@@ -60,7 +60,7 @@
  *   EndpointName endpoint =
  *       EndpointName.ofProjectLocationEndpointName("[PROJECT]", "[LOCATION]", "[ENDPOINT]");
  *   List<Value> instances = new ArrayList<>();
- *   ComputeTokensResponse response = llmUtilityServiceClient.computeTokens(endpoint, instances);
+ *   CountTokensResponse response = llmUtilityServiceClient.countTokens(endpoint, instances);
  * }
  * }</pre>
  *
@@ -74,6 +74,25 @@
  *      <th>Description</th>
  *      <th>Method Variants</th>
  *    <tr>
+ *      <td>CountTokens</td>
+ *      <td><p> Perform a token counting.</td>
+ *      <td>
+ *      <p>Request object method variants only take one parameter, a request object, which must be constructed before the call.</p>
+ *      <ul>
+ *           <li>countTokens(CountTokensRequest request)
+ *      </ul>
+ *      <p>"Flattened" method variants have converted the fields of the request object into function parameters to enable multiple ways to call the same method.</p>
+ *      <ul>
+ *           <li>countTokens(EndpointName endpoint, List<Value> instances)
+ *           <li>countTokens(String endpoint, List<Value> instances)
+ *      </ul>
+ *      <p>Callable method variants take no parameters and return an immutable API callable object, which can be used to initiate calls to the service.</p>
+ *      <ul>
+ *           <li>countTokensCallable()
+ *      </ul>
+ *       </td>
+ *    </tr>
+ *    <tr>
  *      <td>ComputeTokens</td>
  *      <td><p> Return a list of tokens based on the input text.</td>
  *      <td>
@@ -260,6 +279,142 @@ public LlmUtilityServiceStub getStub() {
     return stub;
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Perform a token counting.
+   *
+   * <p>Sample code:
+   *
+   * <pre>{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (LlmUtilityServiceClient llmUtilityServiceClient = LlmUtilityServiceClient.create()) {
+   *   EndpointName endpoint =
+   *       EndpointName.ofProjectLocationEndpointName("[PROJECT]", "[LOCATION]", "[ENDPOINT]");
+   *   List<Value> instances = new ArrayList<>();
+   *   CountTokensResponse response = llmUtilityServiceClient.countTokens(endpoint, instances);
+   * }
+   * }</pre>
+   *
+   * @param endpoint Required. The name of the Endpoint requested to perform token counting. Format:
+   *     `projects/{project}/locations/{location}/endpoints/{endpoint}`
+   * @param instances Required. The instances that are the input to token counting call. Schema is
+   *     identical to the prediction schema of the underlying model.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final CountTokensResponse countTokens(EndpointName endpoint, List<Value> instances) {
+    CountTokensRequest request =
+        CountTokensRequest.newBuilder()
+            .setEndpoint(endpoint == null ? null : endpoint.toString())
+            .addAllInstances(instances)
+            .build();
+    return countTokens(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Perform a token counting.
+   *
+   * <p>Sample code:
+   *
+   * <pre>{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (LlmUtilityServiceClient llmUtilityServiceClient = LlmUtilityServiceClient.create()) {
+   *   String endpoint =
+   *       EndpointName.ofProjectLocationEndpointName("[PROJECT]", "[LOCATION]", "[ENDPOINT]")
+   *           .toString();
+   *   List<Value> instances = new ArrayList<>();
+   *   CountTokensResponse response = llmUtilityServiceClient.countTokens(endpoint, instances);
+   * }
+   * }</pre>
+   *
+   * @param endpoint Required. The name of the Endpoint requested to perform token counting. Format:
+   *     `projects/{project}/locations/{location}/endpoints/{endpoint}`
+   * @param instances Required. The instances that are the input to token counting call. Schema is
+   *     identical to the prediction schema of the underlying model.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final CountTokensResponse countTokens(String endpoint, List<Value> instances) {
+    CountTokensRequest request =
+        CountTokensRequest.newBuilder().setEndpoint(endpoint).addAllInstances(instances).build();
+    return countTokens(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Perform a token counting.
+   *
+   * <p>Sample code:
+   *
+   * <pre>{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (LlmUtilityServiceClient llmUtilityServiceClient = LlmUtilityServiceClient.create()) {
+   *   CountTokensRequest request =
+   *       CountTokensRequest.newBuilder()
+   *           .setEndpoint(
+   *               EndpointName.ofProjectLocationEndpointName(
+   *                       "[PROJECT]", "[LOCATION]", "[ENDPOINT]")
+   *                   .toString())
+   *           .setModel("model104069929")
+   *           .addAllInstances(new ArrayList<Value>())
+   *           .addAllContents(new ArrayList<Content>())
+   *           .build();
+   *   CountTokensResponse response = llmUtilityServiceClient.countTokens(request);
+   * }
+   * }</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 CountTokensResponse countTokens(CountTokensRequest request) {
+    return countTokensCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD.
+  /**
+   * Perform a token counting.
+   *
+   * <p>Sample code:
+   *
+   * <pre>{@code
+   * // This snippet has been automatically generated and should be regarded as a code template only.
+   * // It will require modifications to work:
+   * // - It may require correct/in-range values for request initialization.
+   * // - It may require specifying regional endpoints when creating the service client as shown in
+   * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+   * try (LlmUtilityServiceClient llmUtilityServiceClient = LlmUtilityServiceClient.create()) {
+   *   CountTokensRequest request =
+   *       CountTokensRequest.newBuilder()
+   *           .setEndpoint(
+   *               EndpointName.ofProjectLocationEndpointName(
+   *                       "[PROJECT]", "[LOCATION]", "[ENDPOINT]")
+   *                   .toString())
+   *           .setModel("model104069929")
+   *           .addAllInstances(new ArrayList<Value>())
+   *           .addAllContents(new ArrayList<Content>())
+   *           .build();
+   *   ApiFuture<CountTokensResponse> future =
+   *       llmUtilityServiceClient.countTokensCallable().futureCall(request);
+   *   // Do something.
+   *   CountTokensResponse response = future.get();
+   * }
+   * }</pre>
+   */
+  public final UnaryCallable<CountTokensRequest, CountTokensResponse> countTokensCallable() {
+    return stub.countTokensCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD.
   /**
    * Return a list of tokens based on the input text.
diff --git a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceSettings.java b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceSettings.java
index 7fd8418aa2ab..8d47be4f8841 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceSettings.java
+++ b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceSettings.java
@@ -58,7 +58,7 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of computeTokens to 30 seconds:
+ * <p>For example, to set the total timeout of countTokens to 30 seconds:
  *
  * <pre>{@code
  * // This snippet has been automatically generated and should be regarded as a code template only.
@@ -69,10 +69,10 @@
  * LlmUtilityServiceSettings.Builder llmUtilityServiceSettingsBuilder =
  *     LlmUtilityServiceSettings.newBuilder();
  * llmUtilityServiceSettingsBuilder
- *     .computeTokensSettings()
+ *     .countTokensSettings()
  *     .setRetrySettings(
  *         llmUtilityServiceSettingsBuilder
- *             .computeTokensSettings()
+ *             .countTokensSettings()
  *             .getRetrySettings()
  *             .toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
@@ -84,6 +84,11 @@
 @Generated("by gapic-generator-java")
 public class LlmUtilityServiceSettings extends ClientSettings<LlmUtilityServiceSettings> {
 
+  /** Returns the object with the settings used for calls to countTokens. */
+  public UnaryCallSettings<CountTokensRequest, CountTokensResponse> countTokensSettings() {
+    return ((LlmUtilityServiceStubSettings) getStubSettings()).countTokensSettings();
+  }
+
   /** Returns the object with the settings used for calls to computeTokens. */
   public UnaryCallSettings<ComputeTokensRequest, ComputeTokensResponse> computeTokensSettings() {
     return ((LlmUtilityServiceStubSettings) getStubSettings()).computeTokensSettings();
@@ -213,6 +218,12 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
+    /** Returns the builder for the settings used for calls to countTokens. */
+    public UnaryCallSettings.Builder<CountTokensRequest, CountTokensResponse>
+        countTokensSettings() {
+      return getStubSettingsBuilder().countTokensSettings();
+    }
+
     /** Returns the builder for the settings used for calls to computeTokens. */
     public UnaryCallSettings.Builder<ComputeTokensRequest, ComputeTokensResponse>
         computeTokensSettings() {
diff --git a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/gapic_metadata.json b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/gapic_metadata.json
index 665ec198eb35..7424ae9d9986 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/gapic_metadata.json
+++ b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/gapic_metadata.json
@@ -667,6 +667,9 @@
             "ComputeTokens": {
               "methods": ["computeTokens", "computeTokens", "computeTokens", "computeTokensCallable"]
             },
+            "CountTokens": {
+              "methods": ["countTokens", "countTokens", "countTokens", "countTokensCallable"]
+            },
             "GetIamPolicy": {
               "methods": ["getIamPolicy", "getIamPolicyCallable"]
             },
diff --git a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/package-info.java b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/package-info.java
index b66d536a02d5..5583cbec672f 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/package-info.java
+++ b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/package-info.java
@@ -249,7 +249,7 @@
  *   EndpointName endpoint =
  *       EndpointName.ofProjectLocationEndpointName("[PROJECT]", "[LOCATION]", "[ENDPOINT]");
  *   List<Value> instances = new ArrayList<>();
- *   ComputeTokensResponse response = llmUtilityServiceClient.computeTokens(endpoint, instances);
+ *   CountTokensResponse response = llmUtilityServiceClient.countTokens(endpoint, instances);
  * }
  * }</pre>
  *
diff --git a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/GrpcLlmUtilityServiceStub.java b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/GrpcLlmUtilityServiceStub.java
index e1c31ac8ac65..e7ee6efbbddd 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/GrpcLlmUtilityServiceStub.java
+++ b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/GrpcLlmUtilityServiceStub.java
@@ -28,6 +28,8 @@
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.aiplatform.v1beta1.ComputeTokensRequest;
 import com.google.cloud.aiplatform.v1beta1.ComputeTokensResponse;
+import com.google.cloud.aiplatform.v1beta1.CountTokensRequest;
+import com.google.cloud.aiplatform.v1beta1.CountTokensResponse;
 import com.google.cloud.location.GetLocationRequest;
 import com.google.cloud.location.ListLocationsRequest;
 import com.google.cloud.location.ListLocationsResponse;
@@ -53,6 +55,16 @@
 @BetaApi
 @Generated("by gapic-generator-java")
 public class GrpcLlmUtilityServiceStub extends LlmUtilityServiceStub {
+  private static final MethodDescriptor<CountTokensRequest, CountTokensResponse>
+      countTokensMethodDescriptor =
+          MethodDescriptor.<CountTokensRequest, CountTokensResponse>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.aiplatform.v1beta1.LlmUtilityService/CountTokens")
+              .setRequestMarshaller(ProtoUtils.marshaller(CountTokensRequest.getDefaultInstance()))
+              .setResponseMarshaller(
+                  ProtoUtils.marshaller(CountTokensResponse.getDefaultInstance()))
+              .build();
+
   private static final MethodDescriptor<ComputeTokensRequest, ComputeTokensResponse>
       computeTokensMethodDescriptor =
           MethodDescriptor.<ComputeTokensRequest, ComputeTokensResponse>newBuilder()
@@ -110,6 +122,7 @@ public class GrpcLlmUtilityServiceStub extends LlmUtilityServiceStub {
                   ProtoUtils.marshaller(TestIamPermissionsResponse.getDefaultInstance()))
               .build();
 
+  private final UnaryCallable<CountTokensRequest, CountTokensResponse> countTokensCallable;
   private final UnaryCallable<ComputeTokensRequest, ComputeTokensResponse> computeTokensCallable;
   private final UnaryCallable<ListLocationsRequest, ListLocationsResponse> listLocationsCallable;
   private final UnaryCallable<ListLocationsRequest, ListLocationsPagedResponse>
@@ -164,6 +177,16 @@ protected GrpcLlmUtilityServiceStub(
     this.callableFactory = callableFactory;
     this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory);
 
+    GrpcCallSettings<CountTokensRequest, CountTokensResponse> countTokensTransportSettings =
+        GrpcCallSettings.<CountTokensRequest, CountTokensResponse>newBuilder()
+            .setMethodDescriptor(countTokensMethodDescriptor)
+            .setParamsExtractor(
+                request -> {
+                  RequestParamsBuilder builder = RequestParamsBuilder.create();
+                  builder.add("endpoint", String.valueOf(request.getEndpoint()));
+                  return builder.build();
+                })
+            .build();
     GrpcCallSettings<ComputeTokensRequest, ComputeTokensResponse> computeTokensTransportSettings =
         GrpcCallSettings.<ComputeTokensRequest, ComputeTokensResponse>newBuilder()
             .setMethodDescriptor(computeTokensMethodDescriptor)
@@ -226,6 +249,9 @@ protected GrpcLlmUtilityServiceStub(
                     })
                 .build();
 
+    this.countTokensCallable =
+        callableFactory.createUnaryCallable(
+            countTokensTransportSettings, settings.countTokensSettings(), clientContext);
     this.computeTokensCallable =
         callableFactory.createUnaryCallable(
             computeTokensTransportSettings, settings.computeTokensSettings(), clientContext);
@@ -258,6 +284,11 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
+  @Override
+  public UnaryCallable<CountTokensRequest, CountTokensResponse> countTokensCallable() {
+    return countTokensCallable;
+  }
+
   @Override
   public UnaryCallable<ComputeTokensRequest, ComputeTokensResponse> computeTokensCallable() {
     return computeTokensCallable;
diff --git a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/LlmUtilityServiceStub.java b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/LlmUtilityServiceStub.java
index a9fd48663d3e..c924760e72d9 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/LlmUtilityServiceStub.java
+++ b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/LlmUtilityServiceStub.java
@@ -23,6 +23,8 @@
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.aiplatform.v1beta1.ComputeTokensRequest;
 import com.google.cloud.aiplatform.v1beta1.ComputeTokensResponse;
+import com.google.cloud.aiplatform.v1beta1.CountTokensRequest;
+import com.google.cloud.aiplatform.v1beta1.CountTokensResponse;
 import com.google.cloud.location.GetLocationRequest;
 import com.google.cloud.location.ListLocationsRequest;
 import com.google.cloud.location.ListLocationsResponse;
@@ -44,6 +46,10 @@
 @Generated("by gapic-generator-java")
 public abstract class LlmUtilityServiceStub implements BackgroundResource {
 
+  public UnaryCallable<CountTokensRequest, CountTokensResponse> countTokensCallable() {
+    throw new UnsupportedOperationException("Not implemented: countTokensCallable()");
+  }
+
   public UnaryCallable<ComputeTokensRequest, ComputeTokensResponse> computeTokensCallable() {
     throw new UnsupportedOperationException("Not implemented: computeTokensCallable()");
   }
diff --git a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/LlmUtilityServiceStubSettings.java b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/LlmUtilityServiceStubSettings.java
index 1b3e405fcd85..ca2f1557af8e 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/LlmUtilityServiceStubSettings.java
+++ b/java-aiplatform/google-cloud-aiplatform/src/main/java/com/google/cloud/aiplatform/v1beta1/stub/LlmUtilityServiceStubSettings.java
@@ -42,6 +42,8 @@
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.aiplatform.v1beta1.ComputeTokensRequest;
 import com.google.cloud.aiplatform.v1beta1.ComputeTokensResponse;
+import com.google.cloud.aiplatform.v1beta1.CountTokensRequest;
+import com.google.cloud.aiplatform.v1beta1.CountTokensResponse;
 import com.google.cloud.location.GetLocationRequest;
 import com.google.cloud.location.ListLocationsRequest;
 import com.google.cloud.location.ListLocationsResponse;
@@ -74,7 +76,7 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of computeTokens to 30 seconds:
+ * <p>For example, to set the total timeout of countTokens to 30 seconds:
  *
  * <pre>{@code
  * // This snippet has been automatically generated and should be regarded as a code template only.
@@ -85,10 +87,10 @@
  * LlmUtilityServiceStubSettings.Builder llmUtilityServiceSettingsBuilder =
  *     LlmUtilityServiceStubSettings.newBuilder();
  * llmUtilityServiceSettingsBuilder
- *     .computeTokensSettings()
+ *     .countTokensSettings()
  *     .setRetrySettings(
  *         llmUtilityServiceSettingsBuilder
- *             .computeTokensSettings()
+ *             .countTokensSettings()
  *             .getRetrySettings()
  *             .toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
@@ -104,6 +106,7 @@ public class LlmUtilityServiceStubSettings extends StubSettings<LlmUtilityServic
   private static final ImmutableList<String> DEFAULT_SERVICE_SCOPES =
       ImmutableList.<String>builder().add("https://www.googleapis.com/auth/cloud-platform").build();
 
+  private final UnaryCallSettings<CountTokensRequest, CountTokensResponse> countTokensSettings;
   private final UnaryCallSettings<ComputeTokensRequest, ComputeTokensResponse>
       computeTokensSettings;
   private final PagedCallSettings<
@@ -168,6 +171,11 @@ public ApiFuture<ListLocationsPagedResponse> getFuturePagedResponse(
             }
           };
 
+  /** Returns the object with the settings used for calls to countTokens. */
+  public UnaryCallSettings<CountTokensRequest, CountTokensResponse> countTokensSettings() {
+    return countTokensSettings;
+  }
+
   /** Returns the object with the settings used for calls to computeTokens. */
   public UnaryCallSettings<ComputeTokensRequest, ComputeTokensResponse> computeTokensSettings() {
     return computeTokensSettings;
@@ -281,6 +289,7 @@ public Builder toBuilder() {
   protected LlmUtilityServiceStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
+    countTokensSettings = settingsBuilder.countTokensSettings().build();
     computeTokensSettings = settingsBuilder.computeTokensSettings().build();
     listLocationsSettings = settingsBuilder.listLocationsSettings().build();
     getLocationSettings = settingsBuilder.getLocationSettings().build();
@@ -292,6 +301,8 @@ protected LlmUtilityServiceStubSettings(Builder settingsBuilder) throws IOExcept
   /** Builder for LlmUtilityServiceStubSettings. */
   public static class Builder extends StubSettings.Builder<LlmUtilityServiceStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
+    private final UnaryCallSettings.Builder<CountTokensRequest, CountTokensResponse>
+        countTokensSettings;
     private final UnaryCallSettings.Builder<ComputeTokensRequest, ComputeTokensResponse>
         computeTokensSettings;
     private final PagedCallSettings.Builder<
@@ -329,6 +340,7 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
+      countTokensSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       computeTokensSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
       listLocationsSettings = PagedCallSettings.newBuilder(LIST_LOCATIONS_PAGE_STR_FACT);
       getLocationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -338,6 +350,7 @@ protected Builder(ClientContext clientContext) {
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
+              countTokensSettings,
               computeTokensSettings,
               listLocationsSettings,
               getLocationSettings,
@@ -350,6 +363,7 @@ protected Builder(ClientContext clientContext) {
     protected Builder(LlmUtilityServiceStubSettings settings) {
       super(settings);
 
+      countTokensSettings = settings.countTokensSettings.toBuilder();
       computeTokensSettings = settings.computeTokensSettings.toBuilder();
       listLocationsSettings = settings.listLocationsSettings.toBuilder();
       getLocationSettings = settings.getLocationSettings.toBuilder();
@@ -359,6 +373,7 @@ protected Builder(LlmUtilityServiceStubSettings settings) {
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
+              countTokensSettings,
               computeTokensSettings,
               listLocationsSettings,
               getLocationSettings,
@@ -381,6 +396,11 @@ private static Builder createDefault() {
     }
 
     private static Builder initDefaults(Builder builder) {
+      builder
+          .countTokensSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_params"));
+
       builder
           .computeTokensSettings()
           .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_codes"))
@@ -429,6 +449,12 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
+    /** Returns the builder for the settings used for calls to countTokens. */
+    public UnaryCallSettings.Builder<CountTokensRequest, CountTokensResponse>
+        countTokensSettings() {
+      return countTokensSettings;
+    }
+
     /** Returns the builder for the settings used for calls to computeTokens. */
     public UnaryCallSettings.Builder<ComputeTokensRequest, ComputeTokensResponse>
         computeTokensSettings() {
diff --git a/java-aiplatform/google-cloud-aiplatform/src/test/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceClientTest.java b/java-aiplatform/google-cloud-aiplatform/src/test/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceClientTest.java
index 342dbe57fbc6..2a86d6b007e7 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/test/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceClientTest.java
+++ b/java-aiplatform/google-cloud-aiplatform/src/test/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceClientTest.java
@@ -101,6 +101,92 @@ public void tearDown() throws Exception {
     client.close();
   }
 
+  @Test
+  public void countTokensTest() throws Exception {
+    CountTokensResponse expectedResponse =
+        CountTokensResponse.newBuilder()
+            .setTotalTokens(730673909)
+            .setTotalBillableCharacters(1242495501)
+            .build();
+    mockLlmUtilityService.addResponse(expectedResponse);
+
+    EndpointName endpoint =
+        EndpointName.ofProjectLocationEndpointName("[PROJECT]", "[LOCATION]", "[ENDPOINT]");
+    List<Value> instances = new ArrayList<>();
+
+    CountTokensResponse actualResponse = client.countTokens(endpoint, instances);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockLlmUtilityService.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    CountTokensRequest actualRequest = ((CountTokensRequest) actualRequests.get(0));
+
+    Assert.assertEquals(endpoint.toString(), actualRequest.getEndpoint());
+    Assert.assertEquals(instances, actualRequest.getInstancesList());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void countTokensExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockLlmUtilityService.addException(exception);
+
+    try {
+      EndpointName endpoint =
+          EndpointName.ofProjectLocationEndpointName("[PROJECT]", "[LOCATION]", "[ENDPOINT]");
+      List<Value> instances = new ArrayList<>();
+      client.countTokens(endpoint, instances);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void countTokensTest2() throws Exception {
+    CountTokensResponse expectedResponse =
+        CountTokensResponse.newBuilder()
+            .setTotalTokens(730673909)
+            .setTotalBillableCharacters(1242495501)
+            .build();
+    mockLlmUtilityService.addResponse(expectedResponse);
+
+    String endpoint = "endpoint1741102485";
+    List<Value> instances = new ArrayList<>();
+
+    CountTokensResponse actualResponse = client.countTokens(endpoint, instances);
+    Assert.assertEquals(expectedResponse, actualResponse);
+
+    List<AbstractMessage> actualRequests = mockLlmUtilityService.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    CountTokensRequest actualRequest = ((CountTokensRequest) actualRequests.get(0));
+
+    Assert.assertEquals(endpoint, actualRequest.getEndpoint());
+    Assert.assertEquals(instances, actualRequest.getInstancesList());
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  public void countTokensExceptionTest2() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(io.grpc.Status.INVALID_ARGUMENT);
+    mockLlmUtilityService.addException(exception);
+
+    try {
+      String endpoint = "endpoint1741102485";
+      List<Value> instances = new ArrayList<>();
+      client.countTokens(endpoint, instances);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception.
+    }
+  }
+
   @Test
   public void computeTokensTest() throws Exception {
     ComputeTokensResponse expectedResponse =
diff --git a/java-aiplatform/google-cloud-aiplatform/src/test/java/com/google/cloud/aiplatform/v1beta1/MockLlmUtilityServiceImpl.java b/java-aiplatform/google-cloud-aiplatform/src/test/java/com/google/cloud/aiplatform/v1beta1/MockLlmUtilityServiceImpl.java
index 5bd9d6b48f6a..9d1ab9dd65a6 100644
--- a/java-aiplatform/google-cloud-aiplatform/src/test/java/com/google/cloud/aiplatform/v1beta1/MockLlmUtilityServiceImpl.java
+++ b/java-aiplatform/google-cloud-aiplatform/src/test/java/com/google/cloud/aiplatform/v1beta1/MockLlmUtilityServiceImpl.java
@@ -58,6 +58,27 @@ public void reset() {
     responses = new LinkedList<>();
   }
 
+  @Override
+  public void countTokens(
+      CountTokensRequest request, StreamObserver<CountTokensResponse> responseObserver) {
+    Object response = responses.poll();
+    if (response instanceof CountTokensResponse) {
+      requests.add(request);
+      responseObserver.onNext(((CountTokensResponse) response));
+      responseObserver.onCompleted();
+    } else if (response instanceof Exception) {
+      responseObserver.onError(((Exception) response));
+    } else {
+      responseObserver.onError(
+          new IllegalArgumentException(
+              String.format(
+                  "Unrecognized response type %s for method CountTokens, expected %s or %s",
+                  response == null ? "null" : response.getClass().getName(),
+                  CountTokensResponse.class.getName(),
+                  Exception.class.getName())));
+    }
+  }
+
   @Override
   public void computeTokens(
       ComputeTokensRequest request, StreamObserver<ComputeTokensResponse> responseObserver) {
diff --git a/java-aiplatform/grpc-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceGrpc.java b/java-aiplatform/grpc-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceGrpc.java
index 1b64c860cd66..fd0736e17fcb 100644
--- a/java-aiplatform/grpc-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceGrpc.java
+++ b/java-aiplatform/grpc-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceGrpc.java
@@ -36,6 +36,53 @@ private LlmUtilityServiceGrpc() {}
       "google.cloud.aiplatform.v1beta1.LlmUtilityService";
 
   // Static method descriptors that strictly reflect the proto.
+  private static volatile io.grpc.MethodDescriptor<
+          com.google.cloud.aiplatform.v1beta1.CountTokensRequest,
+          com.google.cloud.aiplatform.v1beta1.CountTokensResponse>
+      getCountTokensMethod;
+
+  @io.grpc.stub.annotations.RpcMethod(
+      fullMethodName = SERVICE_NAME + '/' + "CountTokens",
+      requestType = com.google.cloud.aiplatform.v1beta1.CountTokensRequest.class,
+      responseType = com.google.cloud.aiplatform.v1beta1.CountTokensResponse.class,
+      methodType = io.grpc.MethodDescriptor.MethodType.UNARY)
+  public static io.grpc.MethodDescriptor<
+          com.google.cloud.aiplatform.v1beta1.CountTokensRequest,
+          com.google.cloud.aiplatform.v1beta1.CountTokensResponse>
+      getCountTokensMethod() {
+    io.grpc.MethodDescriptor<
+            com.google.cloud.aiplatform.v1beta1.CountTokensRequest,
+            com.google.cloud.aiplatform.v1beta1.CountTokensResponse>
+        getCountTokensMethod;
+    if ((getCountTokensMethod = LlmUtilityServiceGrpc.getCountTokensMethod) == null) {
+      synchronized (LlmUtilityServiceGrpc.class) {
+        if ((getCountTokensMethod = LlmUtilityServiceGrpc.getCountTokensMethod) == null) {
+          LlmUtilityServiceGrpc.getCountTokensMethod =
+              getCountTokensMethod =
+                  io.grpc.MethodDescriptor
+                      .<com.google.cloud.aiplatform.v1beta1.CountTokensRequest,
+                          com.google.cloud.aiplatform.v1beta1.CountTokensResponse>
+                          newBuilder()
+                      .setType(io.grpc.MethodDescriptor.MethodType.UNARY)
+                      .setFullMethodName(generateFullMethodName(SERVICE_NAME, "CountTokens"))
+                      .setSampledToLocalTracing(true)
+                      .setRequestMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.cloud.aiplatform.v1beta1.CountTokensRequest
+                                  .getDefaultInstance()))
+                      .setResponseMarshaller(
+                          io.grpc.protobuf.ProtoUtils.marshaller(
+                              com.google.cloud.aiplatform.v1beta1.CountTokensResponse
+                                  .getDefaultInstance()))
+                      .setSchemaDescriptor(
+                          new LlmUtilityServiceMethodDescriptorSupplier("CountTokens"))
+                      .build();
+        }
+      }
+    }
+    return getCountTokensMethod;
+  }
+
   private static volatile io.grpc.MethodDescriptor<
           com.google.cloud.aiplatform.v1beta1.ComputeTokensRequest,
           com.google.cloud.aiplatform.v1beta1.ComputeTokensResponse>
@@ -133,6 +180,21 @@ public LlmUtilityServiceFutureStub newStub(
    */
   public interface AsyncService {
 
+    /**
+     *
+     *
+     * <pre>
+     * Perform a token counting.
+     * </pre>
+     */
+    default void countTokens(
+        com.google.cloud.aiplatform.v1beta1.CountTokensRequest request,
+        io.grpc.stub.StreamObserver<com.google.cloud.aiplatform.v1beta1.CountTokensResponse>
+            responseObserver) {
+      io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall(
+          getCountTokensMethod(), responseObserver);
+    }
+
     /**
      *
      *
@@ -184,6 +246,23 @@ protected LlmUtilityServiceStub build(
       return new LlmUtilityServiceStub(channel, callOptions);
     }
 
+    /**
+     *
+     *
+     * <pre>
+     * Perform a token counting.
+     * </pre>
+     */
+    public void countTokens(
+        com.google.cloud.aiplatform.v1beta1.CountTokensRequest request,
+        io.grpc.stub.StreamObserver<com.google.cloud.aiplatform.v1beta1.CountTokensResponse>
+            responseObserver) {
+      io.grpc.stub.ClientCalls.asyncUnaryCall(
+          getChannel().newCall(getCountTokensMethod(), getCallOptions()),
+          request,
+          responseObserver);
+    }
+
     /**
      *
      *
@@ -222,6 +301,19 @@ protected LlmUtilityServiceBlockingStub build(
       return new LlmUtilityServiceBlockingStub(channel, callOptions);
     }
 
+    /**
+     *
+     *
+     * <pre>
+     * Perform a token counting.
+     * </pre>
+     */
+    public com.google.cloud.aiplatform.v1beta1.CountTokensResponse countTokens(
+        com.google.cloud.aiplatform.v1beta1.CountTokensRequest request) {
+      return io.grpc.stub.ClientCalls.blockingUnaryCall(
+          getChannel(), getCountTokensMethod(), getCallOptions(), request);
+    }
+
     /**
      *
      *
@@ -255,6 +347,20 @@ protected LlmUtilityServiceFutureStub build(
       return new LlmUtilityServiceFutureStub(channel, callOptions);
     }
 
+    /**
+     *
+     *
+     * <pre>
+     * Perform a token counting.
+     * </pre>
+     */
+    public com.google.common.util.concurrent.ListenableFuture<
+            com.google.cloud.aiplatform.v1beta1.CountTokensResponse>
+        countTokens(com.google.cloud.aiplatform.v1beta1.CountTokensRequest request) {
+      return io.grpc.stub.ClientCalls.futureUnaryCall(
+          getChannel().newCall(getCountTokensMethod(), getCallOptions()), request);
+    }
+
     /**
      *
      *
@@ -270,7 +376,8 @@ protected LlmUtilityServiceFutureStub build(
     }
   }
 
-  private static final int METHODID_COMPUTE_TOKENS = 0;
+  private static final int METHODID_COUNT_TOKENS = 0;
+  private static final int METHODID_COMPUTE_TOKENS = 1;
 
   private static final class MethodHandlers<Req, Resp>
       implements io.grpc.stub.ServerCalls.UnaryMethod<Req, Resp>,
@@ -289,6 +396,12 @@ private static final class MethodHandlers<Req, Resp>
     @java.lang.SuppressWarnings("unchecked")
     public void invoke(Req request, io.grpc.stub.StreamObserver<Resp> responseObserver) {
       switch (methodId) {
+        case METHODID_COUNT_TOKENS:
+          serviceImpl.countTokens(
+              (com.google.cloud.aiplatform.v1beta1.CountTokensRequest) request,
+              (io.grpc.stub.StreamObserver<com.google.cloud.aiplatform.v1beta1.CountTokensResponse>)
+                  responseObserver);
+          break;
         case METHODID_COMPUTE_TOKENS:
           serviceImpl.computeTokens(
               (com.google.cloud.aiplatform.v1beta1.ComputeTokensRequest) request,
@@ -314,6 +427,13 @@ public io.grpc.stub.StreamObserver<Req> invoke(
 
   public static final io.grpc.ServerServiceDefinition bindService(AsyncService service) {
     return io.grpc.ServerServiceDefinition.builder(getServiceDescriptor())
+        .addMethod(
+            getCountTokensMethod(),
+            io.grpc.stub.ServerCalls.asyncUnaryCall(
+                new MethodHandlers<
+                    com.google.cloud.aiplatform.v1beta1.CountTokensRequest,
+                    com.google.cloud.aiplatform.v1beta1.CountTokensResponse>(
+                    service, METHODID_COUNT_TOKENS)))
         .addMethod(
             getComputeTokensMethod(),
             io.grpc.stub.ServerCalls.asyncUnaryCall(
@@ -372,6 +492,7 @@ public static io.grpc.ServiceDescriptor getServiceDescriptor() {
               result =
                   io.grpc.ServiceDescriptor.newBuilder(SERVICE_NAME)
                       .setSchemaDescriptor(new LlmUtilityServiceFileDescriptorSupplier())
+                      .addMethod(getCountTokensMethod())
                       .addMethod(getComputeTokensMethod())
                       .build();
         }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CreateFeatureOnlineStoreRequest.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CreateFeatureOnlineStoreRequest.java
index 3da870ccb9ad..b10e947a27ba 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CreateFeatureOnlineStoreRequest.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CreateFeatureOnlineStoreRequest.java
@@ -75,7 +75,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * Required. The resource name of the Location to create FeatureOnlineStores.
    * Format:
-   * `projects/{project}/locations/{location}'`
+   * `projects/{project}/locations/{location}`
    * </pre>
    *
    * <code>
@@ -102,7 +102,7 @@ public java.lang.String getParent() {
    * <pre>
    * Required. The resource name of the Location to create FeatureOnlineStores.
    * Format:
-   * `projects/{project}/locations/{location}'`
+   * `projects/{project}/locations/{location}`
    * </pre>
    *
    * <code>
@@ -657,7 +657,7 @@ public Builder mergeFrom(
      * <pre>
      * Required. The resource name of the Location to create FeatureOnlineStores.
      * Format:
-     * `projects/{project}/locations/{location}'`
+     * `projects/{project}/locations/{location}`
      * </pre>
      *
      * <code>
@@ -683,7 +683,7 @@ public java.lang.String getParent() {
      * <pre>
      * Required. The resource name of the Location to create FeatureOnlineStores.
      * Format:
-     * `projects/{project}/locations/{location}'`
+     * `projects/{project}/locations/{location}`
      * </pre>
      *
      * <code>
@@ -709,7 +709,7 @@ public com.google.protobuf.ByteString getParentBytes() {
      * <pre>
      * Required. The resource name of the Location to create FeatureOnlineStores.
      * Format:
-     * `projects/{project}/locations/{location}'`
+     * `projects/{project}/locations/{location}`
      * </pre>
      *
      * <code>
@@ -734,7 +734,7 @@ public Builder setParent(java.lang.String value) {
      * <pre>
      * Required. The resource name of the Location to create FeatureOnlineStores.
      * Format:
-     * `projects/{project}/locations/{location}'`
+     * `projects/{project}/locations/{location}`
      * </pre>
      *
      * <code>
@@ -755,7 +755,7 @@ public Builder clearParent() {
      * <pre>
      * Required. The resource name of the Location to create FeatureOnlineStores.
      * Format:
-     * `projects/{project}/locations/{location}'`
+     * `projects/{project}/locations/{location}`
      * </pre>
      *
      * <code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CreateFeatureOnlineStoreRequestOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CreateFeatureOnlineStoreRequestOrBuilder.java
index 392066740e06..9d64075925fa 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CreateFeatureOnlineStoreRequestOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CreateFeatureOnlineStoreRequestOrBuilder.java
@@ -29,7 +29,7 @@ public interface CreateFeatureOnlineStoreRequestOrBuilder
    * <pre>
    * Required. The resource name of the Location to create FeatureOnlineStores.
    * Format:
-   * `projects/{project}/locations/{location}'`
+   * `projects/{project}/locations/{location}`
    * </pre>
    *
    * <code>
@@ -45,7 +45,7 @@ public interface CreateFeatureOnlineStoreRequestOrBuilder
    * <pre>
    * Required. The resource name of the Location to create FeatureOnlineStores.
    * Format:
-   * `projects/{project}/locations/{location}'`
+   * `projects/{project}/locations/{location}`
    * </pre>
    *
    * <code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobProto.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobProto.java
index 99c929e114ec..c78a3e183539 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobProto.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobProto.java
@@ -101,7 +101,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\022\r\n\005value\030\002 \001(\t:\0028\001:i\352Af\n#aiplatform.goo"
           + "gleapis.com/CustomJob\022?projects/{project"
           + "}/locations/{location}/customJobs/{custo"
-          + "m_job}\"\221\005\n\rCustomJobSpec\022K\n\021worker_pool_"
+          + "m_job}\"\313\005\n\rCustomJobSpec\022K\n\021worker_pool_"
           + "specs\030\001 \003(\0132*.google.cloud.aiplatform.v1"
           + ".WorkerPoolSpecB\004\342A\001\002\022:\n\nscheduling\030\003 \001("
           + "\0132&.google.cloud.aiplatform.v1.Schedulin"
@@ -117,33 +117,36 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ss\030\020 \001(\010B\004\342A\001\001\022>\n\nexperiment\030\021 \001(\tB*\342A\001\001"
           + "\372A#\n!aiplatform.googleapis.com/Context\022B"
           + "\n\016experiment_run\030\022 \001(\tB*\342A\001\001\372A#\n!aiplatf"
-          + "orm.googleapis.com/Context\"\207\003\n\016WorkerPoo"
-          + "lSpec\022C\n\016container_spec\030\006 \001(\0132).google.c"
-          + "loud.aiplatform.v1.ContainerSpecH\000\022L\n\023py"
-          + "thon_package_spec\030\007 \001(\0132-.google.cloud.a"
-          + "iplatform.v1.PythonPackageSpecH\000\022D\n\014mach"
-          + "ine_spec\030\001 \001(\0132\'.google.cloud.aiplatform"
-          + ".v1.MachineSpecB\005\342A\002\001\005\022\033\n\rreplica_count\030"
-          + "\002 \001(\003B\004\342A\001\001\022>\n\nnfs_mounts\030\004 \003(\0132$.google"
-          + ".cloud.aiplatform.v1.NfsMountB\004\342A\001\001\0227\n\td"
-          + "isk_spec\030\005 \001(\0132$.google.cloud.aiplatform"
-          + ".v1.DiskSpecB\006\n\004task\"x\n\rContainerSpec\022\027\n"
-          + "\timage_uri\030\001 \001(\tB\004\342A\001\002\022\017\n\007command\030\002 \003(\t\022"
-          + "\014\n\004args\030\003 \003(\t\022/\n\003env\030\004 \003(\0132\".google.clou"
-          + "d.aiplatform.v1.EnvVar\"\255\001\n\021PythonPackage"
-          + "Spec\022 \n\022executor_image_uri\030\001 \001(\tB\004\342A\001\002\022\032"
-          + "\n\014package_uris\030\002 \003(\tB\004\342A\001\002\022\033\n\rpython_mod"
-          + "ule\030\003 \001(\tB\004\342A\001\002\022\014\n\004args\030\004 \003(\t\022/\n\003env\030\005 \003"
-          + "(\0132\".google.cloud.aiplatform.v1.EnvVar\"~"
-          + "\n\nScheduling\022*\n\007timeout\030\001 \001(\0132\031.google.p"
-          + "rotobuf.Duration\022%\n\035restart_job_on_worke"
-          + "r_restart\030\003 \001(\010\022\035\n\017disable_retries\030\005 \001(\010"
-          + "B\004\342A\001\001B\314\001\n\036com.google.cloud.aiplatform.v"
-          + "1B\016CustomJobProtoP\001Z>cloud.google.com/go"
-          + "/aiplatform/apiv1/aiplatformpb;aiplatfor"
-          + "mpb\252\002\032Google.Cloud.AIPlatform.V1\312\002\032Googl"
-          + "e\\Cloud\\AIPlatform\\V1\352\002\035Google::Cloud::A"
-          + "IPlatform::V1b\006proto3"
+          + "orm.googleapis.com/Context\0228\n\006models\030\024 \003"
+          + "(\tB(\342A\001\001\372A!\n\037aiplatform.googleapis.com/M"
+          + "odel\"\207\003\n\016WorkerPoolSpec\022C\n\016container_spe"
+          + "c\030\006 \001(\0132).google.cloud.aiplatform.v1.Con"
+          + "tainerSpecH\000\022L\n\023python_package_spec\030\007 \001("
+          + "\0132-.google.cloud.aiplatform.v1.PythonPac"
+          + "kageSpecH\000\022D\n\014machine_spec\030\001 \001(\0132\'.googl"
+          + "e.cloud.aiplatform.v1.MachineSpecB\005\342A\002\001\005"
+          + "\022\033\n\rreplica_count\030\002 \001(\003B\004\342A\001\001\022>\n\nnfs_mou"
+          + "nts\030\004 \003(\0132$.google.cloud.aiplatform.v1.N"
+          + "fsMountB\004\342A\001\001\0227\n\tdisk_spec\030\005 \001(\0132$.googl"
+          + "e.cloud.aiplatform.v1.DiskSpecB\006\n\004task\"x"
+          + "\n\rContainerSpec\022\027\n\timage_uri\030\001 \001(\tB\004\342A\001\002"
+          + "\022\017\n\007command\030\002 \003(\t\022\014\n\004args\030\003 \003(\t\022/\n\003env\030\004"
+          + " \003(\0132\".google.cloud.aiplatform.v1.EnvVar"
+          + "\"\255\001\n\021PythonPackageSpec\022 \n\022executor_image"
+          + "_uri\030\001 \001(\tB\004\342A\001\002\022\032\n\014package_uris\030\002 \003(\tB\004"
+          + "\342A\001\002\022\033\n\rpython_module\030\003 \001(\tB\004\342A\001\002\022\014\n\004arg"
+          + "s\030\004 \003(\t\022/\n\003env\030\005 \003(\0132\".google.cloud.aipl"
+          + "atform.v1.EnvVar\"\272\001\n\nScheduling\022*\n\007timeo"
+          + "ut\030\001 \001(\0132\031.google.protobuf.Duration\022%\n\035r"
+          + "estart_job_on_worker_restart\030\003 \001(\010\022\035\n\017di"
+          + "sable_retries\030\005 \001(\010B\004\342A\001\001\022:\n\021max_wait_du"
+          + "ration\030\006 \001(\0132\031.google.protobuf.DurationB"
+          + "\004\342A\001\001B\314\001\n\036com.google.cloud.aiplatform.v1"
+          + "B\016CustomJobProtoP\001Z>cloud.google.com/go/"
+          + "aiplatform/apiv1/aiplatformpb;aiplatform"
+          + "pb\252\002\032Google.Cloud.AIPlatform.V1\312\002\032Google"
+          + "\\Cloud\\AIPlatform\\V1\352\002\035Google::Cloud::AI"
+          + "Platform::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -213,6 +216,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "EnableDashboardAccess",
               "Experiment",
               "ExperimentRun",
+              "Models",
             });
     internal_static_google_cloud_aiplatform_v1_WorkerPoolSpec_descriptor =
         getDescriptor().getMessageTypes().get(2);
@@ -250,7 +254,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_cloud_aiplatform_v1_Scheduling_descriptor,
             new java.lang.String[] {
-              "Timeout", "RestartJobOnWorkerRestart", "DisableRetries",
+              "Timeout", "RestartJobOnWorkerRestart", "DisableRetries", "MaxWaitDuration",
             });
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobSpec.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobSpec.java
index cb438ba6bdd7..45dc3a4d8123 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobSpec.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobSpec.java
@@ -46,6 +46,7 @@ private CustomJobSpec() {
     tensorboard_ = "";
     experiment_ = "";
     experimentRun_ = "";
+    models_ = com.google.protobuf.LazyStringArrayList.emptyList();
   }
 
   @java.lang.Override
@@ -842,6 +843,126 @@ public com.google.protobuf.ByteString getExperimentRunBytes() {
     }
   }
 
+  public static final int MODELS_FIELD_NUMBER = 20;
+
+  @SuppressWarnings("serial")
+  private com.google.protobuf.LazyStringArrayList models_ =
+      com.google.protobuf.LazyStringArrayList.emptyList();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return A list containing the models.
+   */
+  public com.google.protobuf.ProtocolStringList getModelsList() {
+    return models_;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return The count of models.
+   */
+  public int getModelsCount() {
+    return models_.size();
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @param index The index of the element to return.
+   * @return The models at the given index.
+   */
+  public java.lang.String getModels(int index) {
+    return models_.get(index);
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @param index The index of the value to return.
+   * @return The bytes of the models at the given index.
+   */
+  public com.google.protobuf.ByteString getModelsBytes(int index) {
+    return models_.getByteString(index);
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -892,6 +1013,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protectedArtifactLocationId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 19, protectedArtifactLocationId_);
     }
+    for (int i = 0; i < models_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 20, models_.getRaw(i));
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -944,6 +1068,14 @@ public int getSerializedSize() {
           com.google.protobuf.GeneratedMessageV3.computeStringSize(
               19, protectedArtifactLocationId_);
     }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < models_.size(); i++) {
+        dataSize += computeStringSizeNoTag(models_.getRaw(i));
+      }
+      size += dataSize;
+      size += 2 * getModelsList().size();
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -979,6 +1111,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getEnableDashboardAccess() != other.getEnableDashboardAccess()) return false;
     if (!getExperiment().equals(other.getExperiment())) return false;
     if (!getExperimentRun().equals(other.getExperimentRun())) return false;
+    if (!getModelsList().equals(other.getModelsList())) return false;
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -1022,6 +1155,10 @@ public int hashCode() {
     hash = (53 * hash) + getExperiment().hashCode();
     hash = (37 * hash) + EXPERIMENT_RUN_FIELD_NUMBER;
     hash = (53 * hash) + getExperimentRun().hashCode();
+    if (getModelsCount() > 0) {
+      hash = (37 * hash) + MODELS_FIELD_NUMBER;
+      hash = (53 * hash) + getModelsList().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1187,6 +1324,7 @@ public Builder clear() {
       enableDashboardAccess_ = false;
       experiment_ = "";
       experimentRun_ = "";
+      models_ = com.google.protobuf.LazyStringArrayList.emptyList();
       return this;
     }
 
@@ -1273,6 +1411,10 @@ private void buildPartial0(com.google.cloud.aiplatform.v1.CustomJobSpec result)
       if (((from_bitField0_ & 0x00000800) != 0)) {
         result.experimentRun_ = experimentRun_;
       }
+      if (((from_bitField0_ & 0x00001000) != 0)) {
+        models_.makeImmutable();
+        result.models_ = models_;
+      }
     }
 
     @java.lang.Override
@@ -1399,6 +1541,16 @@ public Builder mergeFrom(com.google.cloud.aiplatform.v1.CustomJobSpec other) {
         bitField0_ |= 0x00000800;
         onChanged();
       }
+      if (!other.models_.isEmpty()) {
+        if (models_.isEmpty()) {
+          models_ = other.models_;
+          bitField0_ |= 0x00001000;
+        } else {
+          ensureModelsIsMutable();
+          models_.addAll(other.models_);
+        }
+        onChanged();
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -1506,6 +1658,13 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000040;
                 break;
               } // case 154
+            case 162:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                ensureModelsIsMutable();
+                models_.add(s);
+                break;
+              } // case 162
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -3722,6 +3881,306 @@ public Builder setExperimentRunBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
+    private com.google.protobuf.LazyStringArrayList models_ =
+        com.google.protobuf.LazyStringArrayList.emptyList();
+
+    private void ensureModelsIsMutable() {
+      if (!models_.isModifiable()) {
+        models_ = new com.google.protobuf.LazyStringArrayList(models_);
+      }
+      bitField0_ |= 0x00001000;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @return A list containing the models.
+     */
+    public com.google.protobuf.ProtocolStringList getModelsList() {
+      models_.makeImmutable();
+      return models_;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @return The count of models.
+     */
+    public int getModelsCount() {
+      return models_.size();
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param index The index of the element to return.
+     * @return The models at the given index.
+     */
+    public java.lang.String getModels(int index) {
+      return models_.get(index);
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param index The index of the value to return.
+     * @return The bytes of the models at the given index.
+     */
+    public com.google.protobuf.ByteString getModelsBytes(int index) {
+      return models_.getByteString(index);
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param index The index to set the value at.
+     * @param value The models to set.
+     * @return This builder for chaining.
+     */
+    public Builder setModels(int index, java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureModelsIsMutable();
+      models_.set(index, value);
+      bitField0_ |= 0x00001000;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param value The models to add.
+     * @return This builder for chaining.
+     */
+    public Builder addModels(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureModelsIsMutable();
+      models_.add(value);
+      bitField0_ |= 0x00001000;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param values The models to add.
+     * @return This builder for chaining.
+     */
+    public Builder addAllModels(java.lang.Iterable<java.lang.String> values) {
+      ensureModelsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(values, models_);
+      bitField0_ |= 0x00001000;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearModels() {
+      models_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      bitField0_ = (bitField0_ & ~0x00001000);
+      ;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param value The bytes of the models to add.
+     * @return This builder for chaining.
+     */
+    public Builder addModelsBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      ensureModelsIsMutable();
+      models_.add(value);
+      bitField0_ |= 0x00001000;
+      onChanged();
+      return this;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobSpecOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobSpecOrBuilder.java
index 13a50a232b3e..2fd52d9fe9a9 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobSpecOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/CustomJobSpecOrBuilder.java
@@ -566,4 +566,111 @@ public interface CustomJobSpecOrBuilder
    * @return The bytes for experimentRun.
    */
   com.google.protobuf.ByteString getExperimentRunBytes();
+
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return A list containing the models.
+   */
+  java.util.List<java.lang.String> getModelsList();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return The count of models.
+   */
+  int getModelsCount();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @param index The index of the element to return.
+   * @return The models at the given index.
+   */
+  java.lang.String getModels(int index);
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @param index The index of the value to return.
+   * @return The bytes of the models at the given index.
+   */
+  com.google.protobuf.ByteString getModelsBytes(int index);
 }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ExportDataResponse.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ExportDataResponse.java
index 4b662e0341ad..30208abc46bb 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ExportDataResponse.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ExportDataResponse.java
@@ -73,8 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -89,8 +90,9 @@ public com.google.protobuf.ProtocolStringList getExportedFilesList() {
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -105,8 +107,9 @@ public int getExportedFilesCount() {
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -122,8 +125,9 @@ public java.lang.String getExportedFiles(int index) {
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -593,8 +597,9 @@ private void ensureExportedFilesIsMutable() {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -610,8 +615,9 @@ public com.google.protobuf.ProtocolStringList getExportedFilesList() {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -626,8 +632,9 @@ public int getExportedFilesCount() {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -643,8 +650,9 @@ public java.lang.String getExportedFiles(int index) {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -660,8 +668,9 @@ public com.google.protobuf.ByteString getExportedFilesBytes(int index) {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -685,8 +694,9 @@ public Builder setExportedFiles(int index, java.lang.String value) {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -709,8 +719,9 @@ public Builder addExportedFiles(java.lang.String value) {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -730,8 +741,9 @@ public Builder addAllExportedFiles(java.lang.Iterable<java.lang.String> values)
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -750,8 +762,9 @@ public Builder clearExportedFiles() {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ExportDataResponseOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ExportDataResponseOrBuilder.java
index cc213622dd35..04aa0102b980 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ExportDataResponseOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ExportDataResponseOrBuilder.java
@@ -28,8 +28,9 @@ public interface ExportDataResponseOrBuilder
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -42,8 +43,9 @@ public interface ExportDataResponseOrBuilder
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -56,8 +58,9 @@ public interface ExportDataResponseOrBuilder
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -71,8 +74,9 @@ public interface ExportDataResponseOrBuilder
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/Feature.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/Feature.java
index fa457abc135f..9f32696fb6cb 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/Feature.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/Feature.java
@@ -2137,7 +2137,7 @@ public com.google.cloud.aiplatform.v1.Feature.MonitoringStatsAnomaly getMonitori
    *
    * <pre>
    * Only applicable for Vertex AI Feature Store.
-   * The name of the BigQuery Table/View columnn hosting data for this version.
+   * The name of the BigQuery Table/View column hosting data for this version.
    * If no value is provided, will use feature_id.
    * </pre>
    *
@@ -2162,7 +2162,7 @@ public java.lang.String getVersionColumnName() {
    *
    * <pre>
    * Only applicable for Vertex AI Feature Store.
-   * The name of the BigQuery Table/View columnn hosting data for this version.
+   * The name of the BigQuery Table/View column hosting data for this version.
    * If no value is provided, will use feature_id.
    * </pre>
    *
@@ -4467,7 +4467,7 @@ public Builder removeMonitoringStatsAnomalies(int index) {
      *
      * <pre>
      * Only applicable for Vertex AI Feature Store.
-     * The name of the BigQuery Table/View columnn hosting data for this version.
+     * The name of the BigQuery Table/View column hosting data for this version.
      * If no value is provided, will use feature_id.
      * </pre>
      *
@@ -4491,7 +4491,7 @@ public java.lang.String getVersionColumnName() {
      *
      * <pre>
      * Only applicable for Vertex AI Feature Store.
-     * The name of the BigQuery Table/View columnn hosting data for this version.
+     * The name of the BigQuery Table/View column hosting data for this version.
      * If no value is provided, will use feature_id.
      * </pre>
      *
@@ -4515,7 +4515,7 @@ public com.google.protobuf.ByteString getVersionColumnNameBytes() {
      *
      * <pre>
      * Only applicable for Vertex AI Feature Store.
-     * The name of the BigQuery Table/View columnn hosting data for this version.
+     * The name of the BigQuery Table/View column hosting data for this version.
      * If no value is provided, will use feature_id.
      * </pre>
      *
@@ -4538,7 +4538,7 @@ public Builder setVersionColumnName(java.lang.String value) {
      *
      * <pre>
      * Only applicable for Vertex AI Feature Store.
-     * The name of the BigQuery Table/View columnn hosting data for this version.
+     * The name of the BigQuery Table/View column hosting data for this version.
      * If no value is provided, will use feature_id.
      * </pre>
      *
@@ -4557,7 +4557,7 @@ public Builder clearVersionColumnName() {
      *
      * <pre>
      * Only applicable for Vertex AI Feature Store.
-     * The name of the BigQuery Table/View columnn hosting data for this version.
+     * The name of the BigQuery Table/View column hosting data for this version.
      * If no value is provided, will use feature_id.
      * </pre>
      *
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/FeatureOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/FeatureOrBuilder.java
index 167c142111e1..af068417df00 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/FeatureOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/FeatureOrBuilder.java
@@ -433,7 +433,7 @@ com.google.cloud.aiplatform.v1.Feature.MonitoringStatsAnomaly getMonitoringStats
    *
    * <pre>
    * Only applicable for Vertex AI Feature Store.
-   * The name of the BigQuery Table/View columnn hosting data for this version.
+   * The name of the BigQuery Table/View column hosting data for this version.
    * If no value is provided, will use feature_id.
    * </pre>
    *
@@ -447,7 +447,7 @@ com.google.cloud.aiplatform.v1.Feature.MonitoringStatsAnomaly getMonitoringStats
    *
    * <pre>
    * Only applicable for Vertex AI Feature Store.
-   * The name of the BigQuery Table/View columnn hosting data for this version.
+   * The name of the BigQuery Table/View column hosting data for this version.
    * If no value is provided, will use feature_id.
    * </pre>
    *
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ModelEvaluation.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ModelEvaluation.java
index bdb60a3b1dfc..0c97eaa47231 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ModelEvaluation.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ModelEvaluation.java
@@ -1715,7 +1715,7 @@ public int getExplanationSpecsCount() {
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
@@ -1733,7 +1733,7 @@ public boolean hasMetadata() {
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
@@ -1751,7 +1751,7 @@ public com.google.protobuf.Value getMetadata() {
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
@@ -4341,7 +4341,7 @@ public Builder removeExplanationSpecs(int index) {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -4358,7 +4358,7 @@ public boolean hasMetadata() {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -4379,7 +4379,7 @@ public com.google.protobuf.Value getMetadata() {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -4404,7 +4404,7 @@ public Builder setMetadata(com.google.protobuf.Value value) {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -4426,7 +4426,7 @@ public Builder setMetadata(com.google.protobuf.Value.Builder builderForValue) {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -4454,7 +4454,7 @@ public Builder mergeMetadata(com.google.protobuf.Value value) {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -4476,7 +4476,7 @@ public Builder clearMetadata() {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -4493,7 +4493,7 @@ public com.google.protobuf.Value.Builder getMetadataBuilder() {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -4512,7 +4512,7 @@ public com.google.protobuf.ValueOrBuilder getMetadataOrBuilder() {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ModelEvaluationOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ModelEvaluationOrBuilder.java
index 66f3d3be5811..8d9840d80ac3 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ModelEvaluationOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/ModelEvaluationOrBuilder.java
@@ -457,7 +457,7 @@ com.google.cloud.aiplatform.v1.ModelEvaluation.ModelEvaluationExplanationSpec ge
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
@@ -472,7 +472,7 @@ com.google.cloud.aiplatform.v1.ModelEvaluation.ModelEvaluationExplanationSpec ge
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
@@ -487,7 +487,7 @@ com.google.cloud.aiplatform.v1.ModelEvaluation.ModelEvaluationExplanationSpec ge
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/Scheduling.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/Scheduling.java
index 09a5a59f0c65..59087f5d4fef 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/Scheduling.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/Scheduling.java
@@ -146,6 +146,65 @@ public boolean getDisableRetries() {
     return disableRetries_;
   }
 
+  public static final int MAX_WAIT_DURATION_FIELD_NUMBER = 6;
+  private com.google.protobuf.Duration maxWaitDuration_;
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return Whether the maxWaitDuration field is set.
+   */
+  @java.lang.Override
+  public boolean hasMaxWaitDuration() {
+    return maxWaitDuration_ != null;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return The maxWaitDuration.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Duration getMaxWaitDuration() {
+    return maxWaitDuration_ == null
+        ? com.google.protobuf.Duration.getDefaultInstance()
+        : maxWaitDuration_;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   */
+  @java.lang.Override
+  public com.google.protobuf.DurationOrBuilder getMaxWaitDurationOrBuilder() {
+    return maxWaitDuration_ == null
+        ? com.google.protobuf.Duration.getDefaultInstance()
+        : maxWaitDuration_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -169,6 +228,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (disableRetries_ != false) {
       output.writeBool(5, disableRetries_);
     }
+    if (maxWaitDuration_ != null) {
+      output.writeMessage(6, getMaxWaitDuration());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -187,6 +249,9 @@ public int getSerializedSize() {
     if (disableRetries_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(5, disableRetries_);
     }
+    if (maxWaitDuration_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getMaxWaitDuration());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -209,6 +274,10 @@ public boolean equals(final java.lang.Object obj) {
     }
     if (getRestartJobOnWorkerRestart() != other.getRestartJobOnWorkerRestart()) return false;
     if (getDisableRetries() != other.getDisableRetries()) return false;
+    if (hasMaxWaitDuration() != other.hasMaxWaitDuration()) return false;
+    if (hasMaxWaitDuration()) {
+      if (!getMaxWaitDuration().equals(other.getMaxWaitDuration())) return false;
+    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -228,6 +297,10 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getRestartJobOnWorkerRestart());
     hash = (37 * hash) + DISABLE_RETRIES_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getDisableRetries());
+    if (hasMaxWaitDuration()) {
+      hash = (37 * hash) + MAX_WAIT_DURATION_FIELD_NUMBER;
+      hash = (53 * hash) + getMaxWaitDuration().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -374,6 +447,11 @@ public Builder clear() {
       }
       restartJobOnWorkerRestart_ = false;
       disableRetries_ = false;
+      maxWaitDuration_ = null;
+      if (maxWaitDurationBuilder_ != null) {
+        maxWaitDurationBuilder_.dispose();
+        maxWaitDurationBuilder_ = null;
+      }
       return this;
     }
 
@@ -419,6 +497,10 @@ private void buildPartial0(com.google.cloud.aiplatform.v1.Scheduling result) {
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.disableRetries_ = disableRetries_;
       }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.maxWaitDuration_ =
+            maxWaitDurationBuilder_ == null ? maxWaitDuration_ : maxWaitDurationBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -475,6 +557,9 @@ public Builder mergeFrom(com.google.cloud.aiplatform.v1.Scheduling other) {
       if (other.getDisableRetries() != false) {
         setDisableRetries(other.getDisableRetries());
       }
+      if (other.hasMaxWaitDuration()) {
+        mergeMaxWaitDuration(other.getMaxWaitDuration());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -519,6 +604,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000004;
                 break;
               } // case 40
+            case 50:
+              {
+                input.readMessage(getMaxWaitDurationFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 50
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -835,6 +926,216 @@ public Builder clearDisableRetries() {
       return this;
     }
 
+    private com.google.protobuf.Duration maxWaitDuration_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Duration,
+            com.google.protobuf.Duration.Builder,
+            com.google.protobuf.DurationOrBuilder>
+        maxWaitDurationBuilder_;
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     *
+     * @return Whether the maxWaitDuration field is set.
+     */
+    public boolean hasMaxWaitDuration() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     *
+     * @return The maxWaitDuration.
+     */
+    public com.google.protobuf.Duration getMaxWaitDuration() {
+      if (maxWaitDurationBuilder_ == null) {
+        return maxWaitDuration_ == null
+            ? com.google.protobuf.Duration.getDefaultInstance()
+            : maxWaitDuration_;
+      } else {
+        return maxWaitDurationBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder setMaxWaitDuration(com.google.protobuf.Duration value) {
+      if (maxWaitDurationBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        maxWaitDuration_ = value;
+      } else {
+        maxWaitDurationBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder setMaxWaitDuration(com.google.protobuf.Duration.Builder builderForValue) {
+      if (maxWaitDurationBuilder_ == null) {
+        maxWaitDuration_ = builderForValue.build();
+      } else {
+        maxWaitDurationBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder mergeMaxWaitDuration(com.google.protobuf.Duration value) {
+      if (maxWaitDurationBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0)
+            && maxWaitDuration_ != null
+            && maxWaitDuration_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getMaxWaitDurationBuilder().mergeFrom(value);
+        } else {
+          maxWaitDuration_ = value;
+        }
+      } else {
+        maxWaitDurationBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder clearMaxWaitDuration() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      maxWaitDuration_ = null;
+      if (maxWaitDurationBuilder_ != null) {
+        maxWaitDurationBuilder_.dispose();
+        maxWaitDurationBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public com.google.protobuf.Duration.Builder getMaxWaitDurationBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getMaxWaitDurationFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public com.google.protobuf.DurationOrBuilder getMaxWaitDurationOrBuilder() {
+      if (maxWaitDurationBuilder_ != null) {
+        return maxWaitDurationBuilder_.getMessageOrBuilder();
+      } else {
+        return maxWaitDuration_ == null
+            ? com.google.protobuf.Duration.getDefaultInstance()
+            : maxWaitDuration_;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Duration,
+            com.google.protobuf.Duration.Builder,
+            com.google.protobuf.DurationOrBuilder>
+        getMaxWaitDurationFieldBuilder() {
+      if (maxWaitDurationBuilder_ == null) {
+        maxWaitDurationBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Duration,
+                com.google.protobuf.Duration.Builder,
+                com.google.protobuf.DurationOrBuilder>(
+                getMaxWaitDuration(), getParentForChildren(), isClean());
+        maxWaitDuration_ = null;
+      }
+      return maxWaitDurationBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SchedulingOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SchedulingOrBuilder.java
index 12ec4a34a376..a6b36d9fc994 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SchedulingOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SchedulingOrBuilder.java
@@ -87,4 +87,48 @@ public interface SchedulingOrBuilder
    * @return The disableRetries.
    */
   boolean getDisableRetries();
+
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return Whether the maxWaitDuration field is set.
+   */
+  boolean hasMaxWaitDuration();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return The maxWaitDuration.
+   */
+  com.google.protobuf.Duration getMaxWaitDuration();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   */
+  com.google.protobuf.DurationOrBuilder getMaxWaitDurationOrBuilder();
 }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SearchDataItemsRequest.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SearchDataItemsRequest.java
index 5e7091ca3994..66c8a2821b65 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SearchDataItemsRequest.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SearchDataItemsRequest.java
@@ -1224,7 +1224,7 @@ public com.google.protobuf.ByteString getDatasetBytes() {
    * </code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.saved_query is deprecated. See
-   *     google/cloud/aiplatform/v1/dataset_service.proto;l=634
+   *     google/cloud/aiplatform/v1/dataset_service.proto;l=635
    * @return The savedQuery.
    */
   @java.lang.Override
@@ -1254,7 +1254,7 @@ public java.lang.String getSavedQuery() {
    * </code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.saved_query is deprecated. See
-   *     google/cloud/aiplatform/v1/dataset_service.proto;l=634
+   *     google/cloud/aiplatform/v1/dataset_service.proto;l=635
    * @return The bytes for savedQuery.
    */
   @java.lang.Override
@@ -1419,7 +1419,7 @@ public com.google.protobuf.ByteString getDataItemFilterBytes() {
    * <code>string annotations_filter = 5 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.annotations_filter is deprecated.
-   *     See google/cloud/aiplatform/v1/dataset_service.proto;l=665
+   *     See google/cloud/aiplatform/v1/dataset_service.proto;l=666
    * @return The annotationsFilter.
    */
   @java.lang.Override
@@ -1447,7 +1447,7 @@ public java.lang.String getAnnotationsFilter() {
    * <code>string annotations_filter = 5 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.annotations_filter is deprecated.
-   *     See google/cloud/aiplatform/v1/dataset_service.proto;l=665
+   *     See google/cloud/aiplatform/v1/dataset_service.proto;l=666
    * @return The bytes for annotationsFilter.
    */
   @java.lang.Override
@@ -1647,7 +1647,7 @@ public int getPageSize() {
    * <code>string order_by = 9 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.order_by is deprecated. See
-   *     google/cloud/aiplatform/v1/dataset_service.proto;l=689
+   *     google/cloud/aiplatform/v1/dataset_service.proto;l=690
    * @return The orderBy.
    */
   @java.lang.Override
@@ -1674,7 +1674,7 @@ public java.lang.String getOrderBy() {
    * <code>string order_by = 9 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.order_by is deprecated. See
-   *     google/cloud/aiplatform/v1/dataset_service.proto;l=689
+   *     google/cloud/aiplatform/v1/dataset_service.proto;l=690
    * @return The bytes for orderBy.
    */
   @java.lang.Override
@@ -2973,7 +2973,7 @@ public Builder setDatasetBytes(com.google.protobuf.ByteString value) {
      * </code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.saved_query is deprecated. See
-     *     google/cloud/aiplatform/v1/dataset_service.proto;l=634
+     *     google/cloud/aiplatform/v1/dataset_service.proto;l=635
      * @return The savedQuery.
      */
     @java.lang.Deprecated
@@ -3002,7 +3002,7 @@ public java.lang.String getSavedQuery() {
      * </code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.saved_query is deprecated. See
-     *     google/cloud/aiplatform/v1/dataset_service.proto;l=634
+     *     google/cloud/aiplatform/v1/dataset_service.proto;l=635
      * @return The bytes for savedQuery.
      */
     @java.lang.Deprecated
@@ -3031,7 +3031,7 @@ public com.google.protobuf.ByteString getSavedQueryBytes() {
      * </code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.saved_query is deprecated. See
-     *     google/cloud/aiplatform/v1/dataset_service.proto;l=634
+     *     google/cloud/aiplatform/v1/dataset_service.proto;l=635
      * @param value The savedQuery to set.
      * @return This builder for chaining.
      */
@@ -3059,7 +3059,7 @@ public Builder setSavedQuery(java.lang.String value) {
      * </code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.saved_query is deprecated. See
-     *     google/cloud/aiplatform/v1/dataset_service.proto;l=634
+     *     google/cloud/aiplatform/v1/dataset_service.proto;l=635
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
@@ -3083,7 +3083,7 @@ public Builder clearSavedQuery() {
      * </code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.saved_query is deprecated. See
-     *     google/cloud/aiplatform/v1/dataset_service.proto;l=634
+     *     google/cloud/aiplatform/v1/dataset_service.proto;l=635
      * @param value The bytes for savedQuery to set.
      * @return This builder for chaining.
      */
@@ -3399,7 +3399,7 @@ public Builder setDataItemFilterBytes(com.google.protobuf.ByteString value) {
      * <code>string annotations_filter = 5 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.annotations_filter is
-     *     deprecated. See google/cloud/aiplatform/v1/dataset_service.proto;l=665
+     *     deprecated. See google/cloud/aiplatform/v1/dataset_service.proto;l=666
      * @return The annotationsFilter.
      */
     @java.lang.Deprecated
@@ -3426,7 +3426,7 @@ public java.lang.String getAnnotationsFilter() {
      * <code>string annotations_filter = 5 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.annotations_filter is
-     *     deprecated. See google/cloud/aiplatform/v1/dataset_service.proto;l=665
+     *     deprecated. See google/cloud/aiplatform/v1/dataset_service.proto;l=666
      * @return The bytes for annotationsFilter.
      */
     @java.lang.Deprecated
@@ -3453,7 +3453,7 @@ public com.google.protobuf.ByteString getAnnotationsFilterBytes() {
      * <code>string annotations_filter = 5 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.annotations_filter is
-     *     deprecated. See google/cloud/aiplatform/v1/dataset_service.proto;l=665
+     *     deprecated. See google/cloud/aiplatform/v1/dataset_service.proto;l=666
      * @param value The annotationsFilter to set.
      * @return This builder for chaining.
      */
@@ -3479,7 +3479,7 @@ public Builder setAnnotationsFilter(java.lang.String value) {
      * <code>string annotations_filter = 5 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.annotations_filter is
-     *     deprecated. See google/cloud/aiplatform/v1/dataset_service.proto;l=665
+     *     deprecated. See google/cloud/aiplatform/v1/dataset_service.proto;l=666
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
@@ -3501,7 +3501,7 @@ public Builder clearAnnotationsFilter() {
      * <code>string annotations_filter = 5 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.annotations_filter is
-     *     deprecated. See google/cloud/aiplatform/v1/dataset_service.proto;l=665
+     *     deprecated. See google/cloud/aiplatform/v1/dataset_service.proto;l=666
      * @param value The bytes for annotationsFilter to set.
      * @return This builder for chaining.
      */
@@ -4042,7 +4042,7 @@ public Builder clearPageSize() {
      * <code>string order_by = 9 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.order_by is deprecated. See
-     *     google/cloud/aiplatform/v1/dataset_service.proto;l=689
+     *     google/cloud/aiplatform/v1/dataset_service.proto;l=690
      * @return The orderBy.
      */
     @java.lang.Deprecated
@@ -4068,7 +4068,7 @@ public java.lang.String getOrderBy() {
      * <code>string order_by = 9 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.order_by is deprecated. See
-     *     google/cloud/aiplatform/v1/dataset_service.proto;l=689
+     *     google/cloud/aiplatform/v1/dataset_service.proto;l=690
      * @return The bytes for orderBy.
      */
     @java.lang.Deprecated
@@ -4094,7 +4094,7 @@ public com.google.protobuf.ByteString getOrderByBytes() {
      * <code>string order_by = 9 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.order_by is deprecated. See
-     *     google/cloud/aiplatform/v1/dataset_service.proto;l=689
+     *     google/cloud/aiplatform/v1/dataset_service.proto;l=690
      * @param value The orderBy to set.
      * @return This builder for chaining.
      */
@@ -4119,7 +4119,7 @@ public Builder setOrderBy(java.lang.String value) {
      * <code>string order_by = 9 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.order_by is deprecated. See
-     *     google/cloud/aiplatform/v1/dataset_service.proto;l=689
+     *     google/cloud/aiplatform/v1/dataset_service.proto;l=690
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
@@ -4140,7 +4140,7 @@ public Builder clearOrderBy() {
      * <code>string order_by = 9 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.order_by is deprecated. See
-     *     google/cloud/aiplatform/v1/dataset_service.proto;l=689
+     *     google/cloud/aiplatform/v1/dataset_service.proto;l=690
      * @param value The bytes for orderBy to set.
      * @return This builder for chaining.
      */
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SearchDataItemsRequestOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SearchDataItemsRequestOrBuilder.java
index 14f8f93a2fb0..50ac8e2eb38e 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SearchDataItemsRequestOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/SearchDataItemsRequestOrBuilder.java
@@ -152,7 +152,7 @@ public interface SearchDataItemsRequestOrBuilder
    * </code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.saved_query is deprecated. See
-   *     google/cloud/aiplatform/v1/dataset_service.proto;l=634
+   *     google/cloud/aiplatform/v1/dataset_service.proto;l=635
    * @return The savedQuery.
    */
   @java.lang.Deprecated
@@ -171,7 +171,7 @@ public interface SearchDataItemsRequestOrBuilder
    * </code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.saved_query is deprecated. See
-   *     google/cloud/aiplatform/v1/dataset_service.proto;l=634
+   *     google/cloud/aiplatform/v1/dataset_service.proto;l=635
    * @return The bytes for savedQuery.
    */
   @java.lang.Deprecated
@@ -269,7 +269,7 @@ public interface SearchDataItemsRequestOrBuilder
    * <code>string annotations_filter = 5 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.annotations_filter is deprecated.
-   *     See google/cloud/aiplatform/v1/dataset_service.proto;l=665
+   *     See google/cloud/aiplatform/v1/dataset_service.proto;l=666
    * @return The annotationsFilter.
    */
   @java.lang.Deprecated
@@ -286,7 +286,7 @@ public interface SearchDataItemsRequestOrBuilder
    * <code>string annotations_filter = 5 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.annotations_filter is deprecated.
-   *     See google/cloud/aiplatform/v1/dataset_service.proto;l=665
+   *     See google/cloud/aiplatform/v1/dataset_service.proto;l=666
    * @return The bytes for annotationsFilter.
    */
   @java.lang.Deprecated
@@ -437,7 +437,7 @@ public interface SearchDataItemsRequestOrBuilder
    * <code>string order_by = 9 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.order_by is deprecated. See
-   *     google/cloud/aiplatform/v1/dataset_service.proto;l=689
+   *     google/cloud/aiplatform/v1/dataset_service.proto;l=690
    * @return The orderBy.
    */
   @java.lang.Deprecated
@@ -453,7 +453,7 @@ public interface SearchDataItemsRequestOrBuilder
    * <code>string order_by = 9 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1.SearchDataItemsRequest.order_by is deprecated. See
-   *     google/cloud/aiplatform/v1/dataset_service.proto;l=689
+   *     google/cloud/aiplatform/v1/dataset_service.proto;l=690
    * @return The bytes for orderBy.
    */
   @java.lang.Deprecated
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/TensorboardServiceProto.java b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/TensorboardServiceProto.java
index 21b3cc408670..a332fd12b4ab 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/TensorboardServiceProto.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/java/com/google/cloud/aiplatform/v1/TensorboardServiceProto.java
@@ -422,7 +422,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "enericOperationMetadata\"t\n\"UpdateTensorb"
           + "oardOperationMetadata\022N\n\020generic_metadat"
           + "a\030\001 \001(\01324.google.cloud.aiplatform.v1.Gen"
-          + "ericOperationMetadata2\213?\n\022TensorboardSer"
+          + "ericOperationMetadata2\331>\n\022TensorboardSer"
           + "vice\022\371\001\n\021CreateTensorboard\0224.google.clou"
           + "d.aiplatform.v1.CreateTensorboardRequest"
           + "\032\035.google.longrunning.Operation\"\216\001\312A1\n\013T"
@@ -532,105 +532,103 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ration\"\207\001\312A0\n\025google.protobuf.Empty\022\027Del"
           + "eteOperationMetadata\332A\004name\202\323\344\223\002G*E/v1/{"
           + "name=projects/*/locations/*/tensorboards"
-          + "/*/experiments/*/runs/*}\022\252\002\n BatchCreate"
+          + "/*/experiments/*/runs/*}\022\230\002\n BatchCreate"
           + "TensorboardTimeSeries\022C.google.cloud.aip"
           + "latform.v1.BatchCreateTensorboardTimeSer"
           + "iesRequest\032D.google.cloud.aiplatform.v1."
           + "BatchCreateTensorboardTimeSeriesResponse"
-          + "\"{\332A\017parent,requests\202\323\344\223\002c\"^/v1/{parent="
+          + "\"i\332A\017parent,requests\202\323\344\223\002Q\"L/v1/{parent="
           + "projects/*/locations/*/tensorboards/*/ex"
-          + "periments/*}/runs/*/timeSeries:batchCrea"
-          + "te:\001*\022\247\002\n\033CreateTensorboardTimeSeries\022>."
-          + "google.cloud.aiplatform.v1.CreateTensorb"
-          + "oardTimeSeriesRequest\0321.google.cloud.aip"
-          + "latform.v1.TensorboardTimeSeries\"\224\001\332A\036pa"
-          + "rent,tensorboard_time_series\202\323\344\223\002m\"R/v1/"
-          + "{parent=projects/*/locations/*/tensorboa"
-          + "rds/*/experiments/*/runs/*}/timeSeries:\027"
-          + "tensorboard_time_series\022\355\001\n\030GetTensorboa"
-          + "rdTimeSeries\022;.google.cloud.aiplatform.v"
-          + "1.GetTensorboardTimeSeriesRequest\0321.goog"
-          + "le.cloud.aiplatform.v1.TensorboardTimeSe"
-          + "ries\"a\332A\004name\202\323\344\223\002T\022R/v1/{name=projects/"
-          + "*/locations/*/tensorboards/*/experiments"
-          + "/*/runs/*/timeSeries/*}\022\305\002\n\033UpdateTensor"
-          + "boardTimeSeries\022>.google.cloud.aiplatfor"
-          + "m.v1.UpdateTensorboardTimeSeriesRequest\032"
-          + "1.google.cloud.aiplatform.v1.Tensorboard"
-          + "TimeSeries\"\262\001\332A#tensorboard_time_series,"
-          + "update_mask\202\323\344\223\002\205\0012j/v1/{tensorboard_tim"
-          + "e_series.name=projects/*/locations/*/ten"
-          + "sorboards/*/experiments/*/runs/*/timeSer"
-          + "ies/*}:\027tensorboard_time_series\022\375\001\n\031List"
-          + "TensorboardTimeSeries\022<.google.cloud.aip"
-          + "latform.v1.ListTensorboardTimeSeriesRequ"
-          + "est\032=.google.cloud.aiplatform.v1.ListTen"
-          + "sorboardTimeSeriesResponse\"c\332A\006parent\202\323\344"
-          + "\223\002T\022R/v1/{parent=projects/*/locations/*/"
-          + "tensorboards/*/experiments/*/runs/*}/tim"
-          + "eSeries\022\223\002\n\033DeleteTensorboardTimeSeries\022"
-          + ">.google.cloud.aiplatform.v1.DeleteTenso"
-          + "rboardTimeSeriesRequest\032\035.google.longrun"
-          + "ning.Operation\"\224\001\312A0\n\025google.protobuf.Em"
-          + "pty\022\027DeleteOperationMetadata\332A\004name\202\323\344\223\002"
-          + "T*R/v1/{name=projects/*/locations/*/tens"
-          + "orboards/*/experiments/*/runs/*/timeSeri"
-          + "es/*}\022\254\002\n\"BatchReadTensorboardTimeSeries"
-          + "Data\022E.google.cloud.aiplatform.v1.BatchR"
-          + "eadTensorboardTimeSeriesDataRequest\032F.go"
-          + "ogle.cloud.aiplatform.v1.BatchReadTensor"
-          + "boardTimeSeriesDataResponse\"w\332A\013tensorbo"
-          + "ard\202\323\344\223\002c\022a/v1/{tensorboard=projects/*/l"
-          + "ocations/*/tensorboards/*}/experiments/*"
-          + "/runs/*/timeSeries:batchRead\022\263\002\n\035ReadTen"
-          + "sorboardTimeSeriesData\022@.google.cloud.ai"
-          + "platform.v1.ReadTensorboardTimeSeriesDat"
-          + "aRequest\032A.google.cloud.aiplatform.v1.Re"
-          + "adTensorboardTimeSeriesDataResponse\"\214\001\332A"
-          + "\027tensorboard_time_series\202\323\344\223\002l\022j/v1/{ten"
-          + "sorboard_time_series=projects/*/location"
-          + "s/*/tensorboards/*/experiments/*/runs/*/"
-          + "timeSeries/*}:read\022\222\002\n\027ReadTensorboardBl"
-          + "obData\022:.google.cloud.aiplatform.v1.Read"
-          + "TensorboardBlobDataRequest\032;.google.clou"
-          + "d.aiplatform.v1.ReadTensorboardBlobDataR"
-          + "esponse\"|\332A\013time_series\202\323\344\223\002h\022f/v1/{time"
-          + "_series=projects/*/locations/*/tensorboa"
-          + "rds/*/experiments/*/runs/*/timeSeries/*}"
-          + ":readBlobData0\001\022\274\002\n\036WriteTensorboardExpe"
-          + "rimentData\022A.google.cloud.aiplatform.v1."
-          + "WriteTensorboardExperimentDataRequest\032B."
-          + "google.cloud.aiplatform.v1.WriteTensorbo"
-          + "ardExperimentDataResponse\"\222\001\332A.tensorboa"
-          + "rd_experiment,write_run_data_requests\202\323\344"
-          + "\223\002[\"V/v1/{tensorboard_experiment=project"
-          + "s/*/locations/*/tensorboards/*/experimen"
-          + "ts/*}:write:\001*\022\231\002\n\027WriteTensorboardRunDa"
-          + "ta\022:.google.cloud.aiplatform.v1.WriteTen"
-          + "sorboardRunDataRequest\032;.google.cloud.ai"
-          + "platform.v1.WriteTensorboardRunDataRespo"
-          + "nse\"\204\001\332A tensorboard_run,time_series_dat"
-          + "a\202\323\344\223\002[\"V/v1/{tensorboard_run=projects/*"
+          + "periments/*}:batchCreate:\001*\022\247\002\n\033CreateTe"
+          + "nsorboardTimeSeries\022>.google.cloud.aipla"
+          + "tform.v1.CreateTensorboardTimeSeriesRequ"
+          + "est\0321.google.cloud.aiplatform.v1.Tensorb"
+          + "oardTimeSeries\"\224\001\332A\036parent,tensorboard_t"
+          + "ime_series\202\323\344\223\002m\"R/v1/{parent=projects/*"
           + "/locations/*/tensorboards/*/experiments/"
-          + "*/runs/*}:write:\001*\022\325\002\n\037ExportTensorboard"
-          + "TimeSeriesData\022B.google.cloud.aiplatform"
-          + ".v1.ExportTensorboardTimeSeriesDataReque"
-          + "st\032C.google.cloud.aiplatform.v1.ExportTe"
-          + "nsorboardTimeSeriesDataResponse\"\250\001\332A\027ten"
-          + "sorboard_time_series\202\323\344\223\002\207\001\"\201\001/v1/{tenso"
-          + "rboard_time_series=projects/*/locations/"
-          + "*/tensorboards/*/experiments/*/runs/*/ti"
-          + "meSeries/*}:exportTensorboardTimeSeries:"
-          + "\001*\032\206\001\312A\031aiplatform.googleapis.com\322Aghttp"
-          + "s://www.googleapis.com/auth/cloud-platfo"
-          + "rm,https://www.googleapis.com/auth/cloud"
-          + "-platform.read-onlyB\325\001\n\036com.google.cloud"
-          + ".aiplatform.v1B\027TensorboardServiceProtoP"
-          + "\001Z>cloud.google.com/go/aiplatform/apiv1/"
-          + "aiplatformpb;aiplatformpb\252\002\032Google.Cloud"
-          + ".AIPlatform.V1\312\002\032Google\\Cloud\\AIPlatform"
-          + "\\V1\352\002\035Google::Cloud::AIPlatform::V1b\006pro"
-          + "to3"
+          + "*/runs/*}/timeSeries:\027tensorboard_time_s"
+          + "eries\022\355\001\n\030GetTensorboardTimeSeries\022;.goo"
+          + "gle.cloud.aiplatform.v1.GetTensorboardTi"
+          + "meSeriesRequest\0321.google.cloud.aiplatfor"
+          + "m.v1.TensorboardTimeSeries\"a\332A\004name\202\323\344\223\002"
+          + "T\022R/v1/{name=projects/*/locations/*/tens"
+          + "orboards/*/experiments/*/runs/*/timeSeri"
+          + "es/*}\022\305\002\n\033UpdateTensorboardTimeSeries\022>."
+          + "google.cloud.aiplatform.v1.UpdateTensorb"
+          + "oardTimeSeriesRequest\0321.google.cloud.aip"
+          + "latform.v1.TensorboardTimeSeries\"\262\001\332A#te"
+          + "nsorboard_time_series,update_mask\202\323\344\223\002\205\001"
+          + "2j/v1/{tensorboard_time_series.name=proj"
+          + "ects/*/locations/*/tensorboards/*/experi"
+          + "ments/*/runs/*/timeSeries/*}:\027tensorboar"
+          + "d_time_series\022\375\001\n\031ListTensorboardTimeSer"
+          + "ies\022<.google.cloud.aiplatform.v1.ListTen"
+          + "sorboardTimeSeriesRequest\032=.google.cloud"
+          + ".aiplatform.v1.ListTensorboardTimeSeries"
+          + "Response\"c\332A\006parent\202\323\344\223\002T\022R/v1/{parent=p"
+          + "rojects/*/locations/*/tensorboards/*/exp"
+          + "eriments/*/runs/*}/timeSeries\022\223\002\n\033Delete"
+          + "TensorboardTimeSeries\022>.google.cloud.aip"
+          + "latform.v1.DeleteTensorboardTimeSeriesRe"
+          + "quest\032\035.google.longrunning.Operation\"\224\001\312"
+          + "A0\n\025google.protobuf.Empty\022\027DeleteOperati"
+          + "onMetadata\332A\004name\202\323\344\223\002T*R/v1/{name=proje"
+          + "cts/*/locations/*/tensorboards/*/experim"
+          + "ents/*/runs/*/timeSeries/*}\022\214\002\n\"BatchRea"
+          + "dTensorboardTimeSeriesData\022E.google.clou"
+          + "d.aiplatform.v1.BatchReadTensorboardTime"
+          + "SeriesDataRequest\032F.google.cloud.aiplatf"
+          + "orm.v1.BatchReadTensorboardTimeSeriesDat"
+          + "aResponse\"W\332A\013tensorboard\202\323\344\223\002C\022A/v1/{te"
+          + "nsorboard=projects/*/locations/*/tensorb"
+          + "oards/*}:batchRead\022\263\002\n\035ReadTensorboardTi"
+          + "meSeriesData\022@.google.cloud.aiplatform.v"
+          + "1.ReadTensorboardTimeSeriesDataRequest\032A"
+          + ".google.cloud.aiplatform.v1.ReadTensorbo"
+          + "ardTimeSeriesDataResponse\"\214\001\332A\027tensorboa"
+          + "rd_time_series\202\323\344\223\002l\022j/v1/{tensorboard_t"
+          + "ime_series=projects/*/locations/*/tensor"
+          + "boards/*/experiments/*/runs/*/timeSeries"
+          + "/*}:read\022\222\002\n\027ReadTensorboardBlobData\022:.g"
+          + "oogle.cloud.aiplatform.v1.ReadTensorboar"
+          + "dBlobDataRequest\032;.google.cloud.aiplatfo"
+          + "rm.v1.ReadTensorboardBlobDataResponse\"|\332"
+          + "A\013time_series\202\323\344\223\002h\022f/v1/{time_series=pr"
+          + "ojects/*/locations/*/tensorboards/*/expe"
+          + "riments/*/runs/*/timeSeries/*}:readBlobD"
+          + "ata0\001\022\274\002\n\036WriteTensorboardExperimentData"
+          + "\022A.google.cloud.aiplatform.v1.WriteTenso"
+          + "rboardExperimentDataRequest\032B.google.clo"
+          + "ud.aiplatform.v1.WriteTensorboardExperim"
+          + "entDataResponse\"\222\001\332A.tensorboard_experim"
+          + "ent,write_run_data_requests\202\323\344\223\002[\"V/v1/{"
+          + "tensorboard_experiment=projects/*/locati"
+          + "ons/*/tensorboards/*/experiments/*}:writ"
+          + "e:\001*\022\231\002\n\027WriteTensorboardRunData\022:.googl"
+          + "e.cloud.aiplatform.v1.WriteTensorboardRu"
+          + "nDataRequest\032;.google.cloud.aiplatform.v"
+          + "1.WriteTensorboardRunDataResponse\"\204\001\332A t"
+          + "ensorboard_run,time_series_data\202\323\344\223\002[\"V/"
+          + "v1/{tensorboard_run=projects/*/locations"
+          + "/*/tensorboards/*/experiments/*/runs/*}:"
+          + "write:\001*\022\325\002\n\037ExportTensorboardTimeSeries"
+          + "Data\022B.google.cloud.aiplatform.v1.Export"
+          + "TensorboardTimeSeriesDataRequest\032C.googl"
+          + "e.cloud.aiplatform.v1.ExportTensorboardT"
+          + "imeSeriesDataResponse\"\250\001\332A\027tensorboard_t"
+          + "ime_series\202\323\344\223\002\207\001\"\201\001/v1/{tensorboard_tim"
+          + "e_series=projects/*/locations/*/tensorbo"
+          + "ards/*/experiments/*/runs/*/timeSeries/*"
+          + "}:exportTensorboardTimeSeries:\001*\032\206\001\312A\031ai"
+          + "platform.googleapis.com\322Aghttps://www.go"
+          + "ogleapis.com/auth/cloud-platform,https:/"
+          + "/www.googleapis.com/auth/cloud-platform."
+          + "read-onlyB\325\001\n\036com.google.cloud.aiplatfor"
+          + "m.v1B\027TensorboardServiceProtoP\001Z>cloud.g"
+          + "oogle.com/go/aiplatform/apiv1/aiplatform"
+          + "pb;aiplatformpb\252\002\032Google.Cloud.AIPlatfor"
+          + "m.V1\312\002\032Google\\Cloud\\AIPlatform\\V1\352\002\035Goog"
+          + "le::Cloud::AIPlatform::V1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/custom_job.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/custom_job.proto
index b129738b6d59..a08fdf351cba 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/custom_job.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/custom_job.proto
@@ -242,6 +242,26 @@ message CustomJobSpec {
       type: "aiplatform.googleapis.com/Context"
     }
   ];
+
+  // Optional. The name of the Model resources for which to generate a mapping
+  // to artifact URIs. Applicable only to some of the Google-provided custom
+  // jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+  //
+  // In order to retrieve a specific version of the model, also provide
+  // the version ID or version alias.
+  //   Example: `projects/{project}/locations/{location}/models/{model}@2`
+  //              or
+  //            `projects/{project}/locations/{location}/models/{model}@golden`
+  // If no version ID or alias is specified, the "default" version will be
+  // returned. The "default" version alias is created for the first version of
+  // the model, and can be moved to other versions later on. There will be
+  // exactly one default version.
+  repeated string models = 20 [
+    (google.api.field_behavior) = OPTIONAL,
+    (google.api.resource_reference) = {
+      type: "aiplatform.googleapis.com/Model"
+    }
+  ];
 }
 
 // Represents the spec of a worker pool in a job.
@@ -329,4 +349,9 @@ message Scheduling {
   // job starts running. If true, overrides
   // `Scheduling.restart_job_on_worker_restart` to false.
   bool disable_retries = 5 [(google.api.field_behavior) = OPTIONAL];
+
+  // Optional. This is the maximum time a user will wait in the QRM queue for
+  // resources. Default is 1 day
+  google.protobuf.Duration max_wait_duration = 6
+      [(google.api.field_behavior) = OPTIONAL];
 }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/dataset_service.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/dataset_service.proto
index 0b308bd29f0e..5dfd0bfe39f6 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/dataset_service.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/dataset_service.proto
@@ -414,8 +414,9 @@ message ExportDataRequest {
 // [DatasetService.ExportData][google.cloud.aiplatform.v1.DatasetService.ExportData].
 message ExportDataResponse {
   // All of the files that are exported in this export operation. For custom
-  // code training export, only three (training, validation and test) GCS paths
-  // in wildcard format are populated (e.g., gs://.../training-*).
+  // code training export, only three (training, validation and test)
+  // Cloud Storage paths in wildcard format are populated
+  // (for example, gs://.../training-*).
   repeated string exported_files = 1;
 
   // Only present for custom code training export use case. Records data stats,
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/feature.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/feature.proto
index 126a5a5aa6e7..464b888905d0 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/feature.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/feature.proto
@@ -167,7 +167,7 @@ message Feature {
       [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Only applicable for Vertex AI Feature Store.
-  // The name of the BigQuery Table/View columnn hosting data for this version.
+  // The name of the BigQuery Table/View column hosting data for this version.
   // If no value is provided, will use feature_id.
   string version_column_name = 106;
 }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/feature_online_store_admin_service.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/feature_online_store_admin_service.proto
index 8733cb31c2f3..a5955570f070 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/feature_online_store_admin_service.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/feature_online_store_admin_service.proto
@@ -196,7 +196,7 @@ service FeatureOnlineStoreAdminService {
 message CreateFeatureOnlineStoreRequest {
   // Required. The resource name of the Location to create FeatureOnlineStores.
   // Format:
-  // `projects/{project}/locations/{location}'`
+  // `projects/{project}/locations/{location}`
   string parent = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = {
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/model_evaluation.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/model_evaluation.proto
index 8fcd5184912c..5cf507a437e6 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/model_evaluation.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/model_evaluation.proto
@@ -115,6 +115,6 @@ message ModelEvaluation {
   // The metadata of the ModelEvaluation.
   // For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
   // structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-  // "evaluation_dataset_path".
+  // "evaluation_dataset_path", "row_based_metrics_path".
   google.protobuf.Value metadata = 11;
 }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/tensorboard_service.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/tensorboard_service.proto
index b5c769c0c134..a732b55c4818 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/tensorboard_service.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1/src/main/proto/google/cloud/aiplatform/v1/tensorboard_service.proto
@@ -238,7 +238,7 @@ service TensorboardService {
   rpc BatchCreateTensorboardTimeSeries(BatchCreateTensorboardTimeSeriesRequest)
       returns (BatchCreateTensorboardTimeSeriesResponse) {
     option (google.api.http) = {
-      post: "/v1/{parent=projects/*/locations/*/tensorboards/*/experiments/*}/runs/*/timeSeries:batchCreate"
+      post: "/v1/{parent=projects/*/locations/*/tensorboards/*/experiments/*}:batchCreate"
       body: "*"
     };
     option (google.api.method_signature) = "parent,requests";
@@ -305,7 +305,7 @@ service TensorboardService {
       BatchReadTensorboardTimeSeriesDataRequest)
       returns (BatchReadTensorboardTimeSeriesDataResponse) {
     option (google.api.http) = {
-      get: "/v1/{tensorboard=projects/*/locations/*/tensorboards/*}/experiments/*/runs/*/timeSeries:batchRead"
+      get: "/v1/{tensorboard=projects/*/locations/*/tensorboards/*}:batchRead"
     };
     option (google.api.method_signature) = "tensorboard";
   }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CreateFeatureOnlineStoreRequest.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CreateFeatureOnlineStoreRequest.java
index 6d974d16bee3..c8a6e22dc061 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CreateFeatureOnlineStoreRequest.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CreateFeatureOnlineStoreRequest.java
@@ -75,7 +75,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    * <pre>
    * Required. The resource name of the Location to create FeatureOnlineStores.
    * Format:
-   * `projects/{project}/locations/{location}'`
+   * `projects/{project}/locations/{location}`
    * </pre>
    *
    * <code>
@@ -102,7 +102,7 @@ public java.lang.String getParent() {
    * <pre>
    * Required. The resource name of the Location to create FeatureOnlineStores.
    * Format:
-   * `projects/{project}/locations/{location}'`
+   * `projects/{project}/locations/{location}`
    * </pre>
    *
    * <code>
@@ -662,7 +662,7 @@ public Builder mergeFrom(
      * <pre>
      * Required. The resource name of the Location to create FeatureOnlineStores.
      * Format:
-     * `projects/{project}/locations/{location}'`
+     * `projects/{project}/locations/{location}`
      * </pre>
      *
      * <code>
@@ -688,7 +688,7 @@ public java.lang.String getParent() {
      * <pre>
      * Required. The resource name of the Location to create FeatureOnlineStores.
      * Format:
-     * `projects/{project}/locations/{location}'`
+     * `projects/{project}/locations/{location}`
      * </pre>
      *
      * <code>
@@ -714,7 +714,7 @@ public com.google.protobuf.ByteString getParentBytes() {
      * <pre>
      * Required. The resource name of the Location to create FeatureOnlineStores.
      * Format:
-     * `projects/{project}/locations/{location}'`
+     * `projects/{project}/locations/{location}`
      * </pre>
      *
      * <code>
@@ -739,7 +739,7 @@ public Builder setParent(java.lang.String value) {
      * <pre>
      * Required. The resource name of the Location to create FeatureOnlineStores.
      * Format:
-     * `projects/{project}/locations/{location}'`
+     * `projects/{project}/locations/{location}`
      * </pre>
      *
      * <code>
@@ -760,7 +760,7 @@ public Builder clearParent() {
      * <pre>
      * Required. The resource name of the Location to create FeatureOnlineStores.
      * Format:
-     * `projects/{project}/locations/{location}'`
+     * `projects/{project}/locations/{location}`
      * </pre>
      *
      * <code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CreateFeatureOnlineStoreRequestOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CreateFeatureOnlineStoreRequestOrBuilder.java
index 4786e495a12f..36833b5e2f6a 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CreateFeatureOnlineStoreRequestOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CreateFeatureOnlineStoreRequestOrBuilder.java
@@ -29,7 +29,7 @@ public interface CreateFeatureOnlineStoreRequestOrBuilder
    * <pre>
    * Required. The resource name of the Location to create FeatureOnlineStores.
    * Format:
-   * `projects/{project}/locations/{location}'`
+   * `projects/{project}/locations/{location}`
    * </pre>
    *
    * <code>
@@ -45,7 +45,7 @@ public interface CreateFeatureOnlineStoreRequestOrBuilder
    * <pre>
    * Required. The resource name of the Location to create FeatureOnlineStores.
    * Format:
-   * `projects/{project}/locations/{location}'`
+   * `projects/{project}/locations/{location}`
    * </pre>
    *
    * <code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobProto.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobProto.java
index f1a7d6b6c41f..5fa31917d031 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobProto.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobProto.java
@@ -102,7 +102,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "isEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:"
           + "i\352Af\n#aiplatform.googleapis.com/CustomJo"
           + "b\022?projects/{project}/locations/{locatio"
-          + "n}/customJobs/{custom_job}\"\367\005\n\rCustomJob"
+          + "n}/customJobs/{custom_job}\"\261\006\n\rCustomJob"
           + "Spec\022U\n\026persistent_resource_id\030\016 \001(\tB5\342A"
           + "\001\001\372A.\n,aiplatform.googleapis.com/Persist"
           + "entResource\022P\n\021worker_pool_specs\030\001 \003(\0132/"
@@ -121,35 +121,38 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "cess\030\020 \001(\010B\004\342A\001\001\022>\n\nexperiment\030\021 \001(\tB*\342A"
           + "\001\001\372A#\n!aiplatform.googleapis.com/Context"
           + "\022B\n\016experiment_run\030\022 \001(\tB*\342A\001\001\372A#\n!aipla"
-          + "tform.googleapis.com/Context\"\240\003\n\016WorkerP"
-          + "oolSpec\022H\n\016container_spec\030\006 \001(\0132..google"
-          + ".cloud.aiplatform.v1beta1.ContainerSpecH"
-          + "\000\022Q\n\023python_package_spec\030\007 \001(\01322.google."
-          + "cloud.aiplatform.v1beta1.PythonPackageSp"
-          + "ecH\000\022I\n\014machine_spec\030\001 \001(\0132,.google.clou"
-          + "d.aiplatform.v1beta1.MachineSpecB\005\342A\002\001\005\022"
-          + "\033\n\rreplica_count\030\002 \001(\003B\004\342A\001\001\022C\n\nnfs_moun"
-          + "ts\030\004 \003(\0132).google.cloud.aiplatform.v1bet"
-          + "a1.NfsMountB\004\342A\001\001\022<\n\tdisk_spec\030\005 \001(\0132).g"
-          + "oogle.cloud.aiplatform.v1beta1.DiskSpecB"
-          + "\006\n\004task\"}\n\rContainerSpec\022\027\n\timage_uri\030\001 "
-          + "\001(\tB\004\342A\001\002\022\017\n\007command\030\002 \003(\t\022\014\n\004args\030\003 \003(\t"
-          + "\0224\n\003env\030\004 \003(\0132\'.google.cloud.aiplatform."
-          + "v1beta1.EnvVar\"\262\001\n\021PythonPackageSpec\022 \n\022"
-          + "executor_image_uri\030\001 \001(\tB\004\342A\001\002\022\032\n\014packag"
-          + "e_uris\030\002 \003(\tB\004\342A\001\002\022\033\n\rpython_module\030\003 \001("
-          + "\tB\004\342A\001\002\022\014\n\004args\030\004 \003(\t\0224\n\003env\030\005 \003(\0132\'.goo"
-          + "gle.cloud.aiplatform.v1beta1.EnvVar\"~\n\nS"
-          + "cheduling\022*\n\007timeout\030\001 \001(\0132\031.google.prot"
-          + "obuf.Duration\022%\n\035restart_job_on_worker_r"
-          + "estart\030\003 \001(\010\022\035\n\017disable_retries\030\005 \001(\010B\004\342"
-          + "A\001\001B\345\001\n#com.google.cloud.aiplatform.v1be"
-          + "ta1B\016CustomJobProtoP\001ZCcloud.google.com/"
-          + "go/aiplatform/apiv1beta1/aiplatformpb;ai"
-          + "platformpb\252\002\037Google.Cloud.AIPlatform.V1B"
-          + "eta1\312\002\037Google\\Cloud\\AIPlatform\\V1beta1\352\002"
-          + "\"Google::Cloud::AIPlatform::V1beta1b\006pro"
-          + "to3"
+          + "tform.googleapis.com/Context\0228\n\006models\030\024"
+          + " \003(\tB(\342A\001\001\372A!\n\037aiplatform.googleapis.com"
+          + "/Model\"\240\003\n\016WorkerPoolSpec\022H\n\016container_s"
+          + "pec\030\006 \001(\0132..google.cloud.aiplatform.v1be"
+          + "ta1.ContainerSpecH\000\022Q\n\023python_package_sp"
+          + "ec\030\007 \001(\01322.google.cloud.aiplatform.v1bet"
+          + "a1.PythonPackageSpecH\000\022I\n\014machine_spec\030\001"
+          + " \001(\0132,.google.cloud.aiplatform.v1beta1.M"
+          + "achineSpecB\005\342A\002\001\005\022\033\n\rreplica_count\030\002 \001(\003"
+          + "B\004\342A\001\001\022C\n\nnfs_mounts\030\004 \003(\0132).google.clou"
+          + "d.aiplatform.v1beta1.NfsMountB\004\342A\001\001\022<\n\td"
+          + "isk_spec\030\005 \001(\0132).google.cloud.aiplatform"
+          + ".v1beta1.DiskSpecB\006\n\004task\"}\n\rContainerSp"
+          + "ec\022\027\n\timage_uri\030\001 \001(\tB\004\342A\001\002\022\017\n\007command\030\002"
+          + " \003(\t\022\014\n\004args\030\003 \003(\t\0224\n\003env\030\004 \003(\0132\'.google"
+          + ".cloud.aiplatform.v1beta1.EnvVar\"\262\001\n\021Pyt"
+          + "honPackageSpec\022 \n\022executor_image_uri\030\001 \001"
+          + "(\tB\004\342A\001\002\022\032\n\014package_uris\030\002 \003(\tB\004\342A\001\002\022\033\n\r"
+          + "python_module\030\003 \001(\tB\004\342A\001\002\022\014\n\004args\030\004 \003(\t\022"
+          + "4\n\003env\030\005 \003(\0132\'.google.cloud.aiplatform.v"
+          + "1beta1.EnvVar\"\272\001\n\nScheduling\022*\n\007timeout\030"
+          + "\001 \001(\0132\031.google.protobuf.Duration\022%\n\035rest"
+          + "art_job_on_worker_restart\030\003 \001(\010\022\035\n\017disab"
+          + "le_retries\030\005 \001(\010B\004\342A\001\001\022:\n\021max_wait_durat"
+          + "ion\030\006 \001(\0132\031.google.protobuf.DurationB\004\342A"
+          + "\001\001B\345\001\n#com.google.cloud.aiplatform.v1bet"
+          + "a1B\016CustomJobProtoP\001ZCcloud.google.com/g"
+          + "o/aiplatform/apiv1beta1/aiplatformpb;aip"
+          + "latformpb\252\002\037Google.Cloud.AIPlatform.V1Be"
+          + "ta1\312\002\037Google\\Cloud\\AIPlatform\\V1beta1\352\002\""
+          + "Google::Cloud::AIPlatform::V1beta1b\006prot"
+          + "o3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -224,6 +227,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "EnableDashboardAccess",
               "Experiment",
               "ExperimentRun",
+              "Models",
             });
     internal_static_google_cloud_aiplatform_v1beta1_WorkerPoolSpec_descriptor =
         getDescriptor().getMessageTypes().get(2);
@@ -261,7 +265,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_cloud_aiplatform_v1beta1_Scheduling_descriptor,
             new java.lang.String[] {
-              "Timeout", "RestartJobOnWorkerRestart", "DisableRetries",
+              "Timeout", "RestartJobOnWorkerRestart", "DisableRetries", "MaxWaitDuration",
             });
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobSpec.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobSpec.java
index 271caa51f512..e254fabf1645 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobSpec.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobSpec.java
@@ -47,6 +47,7 @@ private CustomJobSpec() {
     tensorboard_ = "";
     experiment_ = "";
     experimentRun_ = "";
+    models_ = com.google.protobuf.LazyStringArrayList.emptyList();
   }
 
   @java.lang.Override
@@ -912,6 +913,126 @@ public com.google.protobuf.ByteString getExperimentRunBytes() {
     }
   }
 
+  public static final int MODELS_FIELD_NUMBER = 20;
+
+  @SuppressWarnings("serial")
+  private com.google.protobuf.LazyStringArrayList models_ =
+      com.google.protobuf.LazyStringArrayList.emptyList();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return A list containing the models.
+   */
+  public com.google.protobuf.ProtocolStringList getModelsList() {
+    return models_;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return The count of models.
+   */
+  public int getModelsCount() {
+    return models_.size();
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @param index The index of the element to return.
+   * @return The models at the given index.
+   */
+  public java.lang.String getModels(int index) {
+    return models_.get(index);
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @param index The index of the value to return.
+   * @return The bytes of the models at the given index.
+   */
+  public com.google.protobuf.ByteString getModelsBytes(int index) {
+    return models_.getByteString(index);
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -965,6 +1086,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(protectedArtifactLocationId_)) {
       com.google.protobuf.GeneratedMessageV3.writeString(output, 19, protectedArtifactLocationId_);
     }
+    for (int i = 0; i < models_.size(); i++) {
+      com.google.protobuf.GeneratedMessageV3.writeString(output, 20, models_.getRaw(i));
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -1020,6 +1144,14 @@ public int getSerializedSize() {
           com.google.protobuf.GeneratedMessageV3.computeStringSize(
               19, protectedArtifactLocationId_);
     }
+    {
+      int dataSize = 0;
+      for (int i = 0; i < models_.size(); i++) {
+        dataSize += computeStringSizeNoTag(models_.getRaw(i));
+      }
+      size += dataSize;
+      size += 2 * getModelsList().size();
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -1056,6 +1188,7 @@ public boolean equals(final java.lang.Object obj) {
     if (getEnableDashboardAccess() != other.getEnableDashboardAccess()) return false;
     if (!getExperiment().equals(other.getExperiment())) return false;
     if (!getExperimentRun().equals(other.getExperimentRun())) return false;
+    if (!getModelsList().equals(other.getModelsList())) return false;
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -1101,6 +1234,10 @@ public int hashCode() {
     hash = (53 * hash) + getExperiment().hashCode();
     hash = (37 * hash) + EXPERIMENT_RUN_FIELD_NUMBER;
     hash = (53 * hash) + getExperimentRun().hashCode();
+    if (getModelsCount() > 0) {
+      hash = (37 * hash) + MODELS_FIELD_NUMBER;
+      hash = (53 * hash) + getModelsList().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -1267,6 +1404,7 @@ public Builder clear() {
       enableDashboardAccess_ = false;
       experiment_ = "";
       experimentRun_ = "";
+      models_ = com.google.protobuf.LazyStringArrayList.emptyList();
       return this;
     }
 
@@ -1357,6 +1495,10 @@ private void buildPartial0(com.google.cloud.aiplatform.v1beta1.CustomJobSpec res
       if (((from_bitField0_ & 0x00001000) != 0)) {
         result.experimentRun_ = experimentRun_;
       }
+      if (((from_bitField0_ & 0x00002000) != 0)) {
+        models_.makeImmutable();
+        result.models_ = models_;
+      }
     }
 
     @java.lang.Override
@@ -1489,6 +1631,16 @@ public Builder mergeFrom(com.google.cloud.aiplatform.v1beta1.CustomJobSpec other
         bitField0_ |= 0x00001000;
         onChanged();
       }
+      if (!other.models_.isEmpty()) {
+        if (models_.isEmpty()) {
+          models_ = other.models_;
+          bitField0_ |= 0x00002000;
+        } else {
+          ensureModelsIsMutable();
+          models_.addAll(other.models_);
+        }
+        onChanged();
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -1603,6 +1755,13 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000080;
                 break;
               } // case 154
+            case 162:
+              {
+                java.lang.String s = input.readStringRequireUtf8();
+                ensureModelsIsMutable();
+                models_.add(s);
+                break;
+              } // case 162
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -3970,6 +4129,306 @@ public Builder setExperimentRunBytes(com.google.protobuf.ByteString value) {
       return this;
     }
 
+    private com.google.protobuf.LazyStringArrayList models_ =
+        com.google.protobuf.LazyStringArrayList.emptyList();
+
+    private void ensureModelsIsMutable() {
+      if (!models_.isModifiable()) {
+        models_ = new com.google.protobuf.LazyStringArrayList(models_);
+      }
+      bitField0_ |= 0x00002000;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @return A list containing the models.
+     */
+    public com.google.protobuf.ProtocolStringList getModelsList() {
+      models_.makeImmutable();
+      return models_;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @return The count of models.
+     */
+    public int getModelsCount() {
+      return models_.size();
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param index The index of the element to return.
+     * @return The models at the given index.
+     */
+    public java.lang.String getModels(int index) {
+      return models_.get(index);
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param index The index of the value to return.
+     * @return The bytes of the models at the given index.
+     */
+    public com.google.protobuf.ByteString getModelsBytes(int index) {
+      return models_.getByteString(index);
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param index The index to set the value at.
+     * @param value The models to set.
+     * @return This builder for chaining.
+     */
+    public Builder setModels(int index, java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureModelsIsMutable();
+      models_.set(index, value);
+      bitField0_ |= 0x00002000;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param value The models to add.
+     * @return This builder for chaining.
+     */
+    public Builder addModels(java.lang.String value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      ensureModelsIsMutable();
+      models_.add(value);
+      bitField0_ |= 0x00002000;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param values The models to add.
+     * @return This builder for chaining.
+     */
+    public Builder addAllModels(java.lang.Iterable<java.lang.String> values) {
+      ensureModelsIsMutable();
+      com.google.protobuf.AbstractMessageLite.Builder.addAll(values, models_);
+      bitField0_ |= 0x00002000;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @return This builder for chaining.
+     */
+    public Builder clearModels() {
+      models_ = com.google.protobuf.LazyStringArrayList.emptyList();
+      bitField0_ = (bitField0_ & ~0x00002000);
+      ;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. The name of the Model resources for which to generate a mapping
+     * to artifact URIs. Applicable only to some of the Google-provided custom
+     * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+     *
+     * In order to retrieve a specific version of the model, also provide
+     * the version ID or version alias.
+     *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+     *              or
+     *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+     * If no version ID or alias is specified, the "default" version will be
+     * returned. The "default" version alias is created for the first version of
+     * the model, and can be moved to other versions later on. There will be
+     * exactly one default version.
+     * </pre>
+     *
+     * <code>
+     * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+     * </code>
+     *
+     * @param value The bytes of the models to add.
+     * @return This builder for chaining.
+     */
+    public Builder addModelsBytes(com.google.protobuf.ByteString value) {
+      if (value == null) {
+        throw new NullPointerException();
+      }
+      checkByteStringIsUtf8(value);
+      ensureModelsIsMutable();
+      models_.add(value);
+      bitField0_ |= 0x00002000;
+      onChanged();
+      return this;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobSpecOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobSpecOrBuilder.java
index c8b4336355b2..4e1cafaad307 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobSpecOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/CustomJobSpecOrBuilder.java
@@ -608,4 +608,111 @@ com.google.cloud.aiplatform.v1beta1.WorkerPoolSpecOrBuilder getWorkerPoolSpecsOr
    * @return The bytes for experimentRun.
    */
   com.google.protobuf.ByteString getExperimentRunBytes();
+
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return A list containing the models.
+   */
+  java.util.List<java.lang.String> getModelsList();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @return The count of models.
+   */
+  int getModelsCount();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @param index The index of the element to return.
+   * @return The models at the given index.
+   */
+  java.lang.String getModels(int index);
+  /**
+   *
+   *
+   * <pre>
+   * Optional. The name of the Model resources for which to generate a mapping
+   * to artifact URIs. Applicable only to some of the Google-provided custom
+   * jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+   *
+   * In order to retrieve a specific version of the model, also provide
+   * the version ID or version alias.
+   *   Example: `projects/{project}/locations/{location}/models/{model}&#64;2`
+   *              or
+   *            `projects/{project}/locations/{location}/models/{model}&#64;golden`
+   * If no version ID or alias is specified, the "default" version will be
+   * returned. The "default" version alias is created for the first version of
+   * the model, and can be moved to other versions later on. There will be
+   * exactly one default version.
+   * </pre>
+   *
+   * <code>
+   * repeated string models = 20 [(.google.api.field_behavior) = OPTIONAL, (.google.api.resource_reference) = { ... }
+   * </code>
+   *
+   * @param index The index of the value to return.
+   * @return The bytes of the models at the given index.
+   */
+  com.google.protobuf.ByteString getModelsBytes(int index);
 }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ExportDataResponse.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ExportDataResponse.java
index 5d12487ea82c..57e434628325 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ExportDataResponse.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ExportDataResponse.java
@@ -73,8 +73,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -89,8 +90,9 @@ public com.google.protobuf.ProtocolStringList getExportedFilesList() {
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -105,8 +107,9 @@ public int getExportedFilesCount() {
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -122,8 +125,9 @@ public java.lang.String getExportedFiles(int index) {
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -507,8 +511,9 @@ private void ensureExportedFilesIsMutable() {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -524,8 +529,9 @@ public com.google.protobuf.ProtocolStringList getExportedFilesList() {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -540,8 +546,9 @@ public int getExportedFilesCount() {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -557,8 +564,9 @@ public java.lang.String getExportedFiles(int index) {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -574,8 +582,9 @@ public com.google.protobuf.ByteString getExportedFilesBytes(int index) {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -599,8 +608,9 @@ public Builder setExportedFiles(int index, java.lang.String value) {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -623,8 +633,9 @@ public Builder addExportedFiles(java.lang.String value) {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -644,8 +655,9 @@ public Builder addAllExportedFiles(java.lang.Iterable<java.lang.String> values)
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
@@ -664,8 +676,9 @@ public Builder clearExportedFiles() {
      *
      * <pre>
      * All of the files that are exported in this export operation. For custom
-     * code training export, only three (training, validation and test) GCS paths
-     * in wildcard format are populated (e.g., gs://.../training-*).
+     * code training export, only three (training, validation and test)
+     * Cloud Storage paths in wildcard format are populated
+     * (for example, gs://.../training-*).
      * </pre>
      *
      * <code>repeated string exported_files = 1;</code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ExportDataResponseOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ExportDataResponseOrBuilder.java
index 161df0fa3533..080504c50dc8 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ExportDataResponseOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ExportDataResponseOrBuilder.java
@@ -28,8 +28,9 @@ public interface ExportDataResponseOrBuilder
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -42,8 +43,9 @@ public interface ExportDataResponseOrBuilder
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -56,8 +58,9 @@ public interface ExportDataResponseOrBuilder
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
@@ -71,8 +74,9 @@ public interface ExportDataResponseOrBuilder
    *
    * <pre>
    * All of the files that are exported in this export operation. For custom
-   * code training export, only three (training, validation and test) GCS paths
-   * in wildcard format are populated (e.g., gs://.../training-*).
+   * code training export, only three (training, validation and test)
+   * Cloud Storage paths in wildcard format are populated
+   * (for example, gs://.../training-*).
    * </pre>
    *
    * <code>repeated string exported_files = 1;</code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/Feature.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/Feature.java
index b43ef956ff4d..f08e4a1a0d91 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/Feature.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/Feature.java
@@ -2360,7 +2360,7 @@ public int getMonitoringStatsAnomaliesCount() {
    *
    * <pre>
    * Only applicable for Vertex AI Feature Store.
-   * The name of the BigQuery Table/View columnn hosting data for this version.
+   * The name of the BigQuery Table/View column hosting data for this version.
    * If no value is provided, will use feature_id.
    * </pre>
    *
@@ -2385,7 +2385,7 @@ public java.lang.String getVersionColumnName() {
    *
    * <pre>
    * Only applicable for Vertex AI Feature Store.
-   * The name of the BigQuery Table/View columnn hosting data for this version.
+   * The name of the BigQuery Table/View column hosting data for this version.
    * If no value is provided, will use feature_id.
    * </pre>
    *
@@ -5633,7 +5633,7 @@ public Builder removeMonitoringStatsAnomalies(int index) {
      *
      * <pre>
      * Only applicable for Vertex AI Feature Store.
-     * The name of the BigQuery Table/View columnn hosting data for this version.
+     * The name of the BigQuery Table/View column hosting data for this version.
      * If no value is provided, will use feature_id.
      * </pre>
      *
@@ -5657,7 +5657,7 @@ public java.lang.String getVersionColumnName() {
      *
      * <pre>
      * Only applicable for Vertex AI Feature Store.
-     * The name of the BigQuery Table/View columnn hosting data for this version.
+     * The name of the BigQuery Table/View column hosting data for this version.
      * If no value is provided, will use feature_id.
      * </pre>
      *
@@ -5681,7 +5681,7 @@ public com.google.protobuf.ByteString getVersionColumnNameBytes() {
      *
      * <pre>
      * Only applicable for Vertex AI Feature Store.
-     * The name of the BigQuery Table/View columnn hosting data for this version.
+     * The name of the BigQuery Table/View column hosting data for this version.
      * If no value is provided, will use feature_id.
      * </pre>
      *
@@ -5704,7 +5704,7 @@ public Builder setVersionColumnName(java.lang.String value) {
      *
      * <pre>
      * Only applicable for Vertex AI Feature Store.
-     * The name of the BigQuery Table/View columnn hosting data for this version.
+     * The name of the BigQuery Table/View column hosting data for this version.
      * If no value is provided, will use feature_id.
      * </pre>
      *
@@ -5723,7 +5723,7 @@ public Builder clearVersionColumnName() {
      *
      * <pre>
      * Only applicable for Vertex AI Feature Store.
-     * The name of the BigQuery Table/View columnn hosting data for this version.
+     * The name of the BigQuery Table/View column hosting data for this version.
      * If no value is provided, will use feature_id.
      * </pre>
      *
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOnlineStore.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOnlineStore.java
index 10851dda7460..f382faf336ec 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOnlineStore.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOnlineStore.java
@@ -2298,8 +2298,9 @@ public interface DedicatedServingEndpointOrBuilder
      *
      *
      * <pre>
-     * Optional. Private service connect config.
-     * If
+     * Optional. Private service connect config. The private service connection
+     * is available only for Optimized storage type, not for embedding
+     * management now. If
      * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
      * set to true, customers will use private service connection to send
      * request. Otherwise, the connection will set to public endpoint.
@@ -2316,8 +2317,9 @@ public interface DedicatedServingEndpointOrBuilder
      *
      *
      * <pre>
-     * Optional. Private service connect config.
-     * If
+     * Optional. Private service connect config. The private service connection
+     * is available only for Optimized storage type, not for embedding
+     * management now. If
      * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
      * set to true, customers will use private service connection to send
      * request. Otherwise, the connection will set to public endpoint.
@@ -2335,8 +2337,9 @@ public interface DedicatedServingEndpointOrBuilder
      *
      *
      * <pre>
-     * Optional. Private service connect config.
-     * If
+     * Optional. Private service connect config. The private service connection
+     * is available only for Optimized storage type, not for embedding
+     * management now. If
      * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
      * set to true, customers will use private service connection to send
      * request. Otherwise, the connection will set to public endpoint.
@@ -2382,7 +2385,9 @@ public interface DedicatedServingEndpointOrBuilder
    * <pre>
    * The dedicated serving endpoint for this FeatureOnlineStore. Only need to
    * set when you choose Optimized storage type or enable EmbeddingManagement.
-   * Will use public endpoint by default.
+   * Will use public endpoint by default. Note, for EmbeddingManagement use
+   * case, only [DedicatedServingEndpoint.public_endpoint_domain_name] is
+   * available now.
    * </pre>
    *
    * Protobuf type {@code
@@ -2487,8 +2492,9 @@ public com.google.protobuf.ByteString getPublicEndpointDomainNameBytes() {
      *
      *
      * <pre>
-     * Optional. Private service connect config.
-     * If
+     * Optional. Private service connect config. The private service connection
+     * is available only for Optimized storage type, not for embedding
+     * management now. If
      * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
      * set to true, customers will use private service connection to send
      * request. Otherwise, the connection will set to public endpoint.
@@ -2508,8 +2514,9 @@ public boolean hasPrivateServiceConnectConfig() {
      *
      *
      * <pre>
-     * Optional. Private service connect config.
-     * If
+     * Optional. Private service connect config. The private service connection
+     * is available only for Optimized storage type, not for embedding
+     * management now. If
      * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
      * set to true, customers will use private service connection to send
      * request. Otherwise, the connection will set to public endpoint.
@@ -2532,8 +2539,9 @@ public boolean hasPrivateServiceConnectConfig() {
      *
      *
      * <pre>
-     * Optional. Private service connect config.
-     * If
+     * Optional. Private service connect config. The private service connection
+     * is available only for Optimized storage type, not for embedding
+     * management now. If
      * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
      * set to true, customers will use private service connection to send
      * request. Otherwise, the connection will set to public endpoint.
@@ -2806,7 +2814,9 @@ protected Builder newBuilderForType(
      * <pre>
      * The dedicated serving endpoint for this FeatureOnlineStore. Only need to
      * set when you choose Optimized storage type or enable EmbeddingManagement.
-     * Will use public endpoint by default.
+     * Will use public endpoint by default. Note, for EmbeddingManagement use
+     * case, only [DedicatedServingEndpoint.public_endpoint_domain_name] is
+     * available now.
      * </pre>
      *
      * Protobuf type {@code
@@ -3168,8 +3178,9 @@ public Builder setPublicEndpointDomainNameBytes(com.google.protobuf.ByteString v
        *
        *
        * <pre>
-       * Optional. Private service connect config.
-       * If
+       * Optional. Private service connect config. The private service connection
+       * is available only for Optimized storage type, not for embedding
+       * management now. If
        * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
        * set to true, customers will use private service connection to send
        * request. Otherwise, the connection will set to public endpoint.
@@ -3188,8 +3199,9 @@ public boolean hasPrivateServiceConnectConfig() {
        *
        *
        * <pre>
-       * Optional. Private service connect config.
-       * If
+       * Optional. Private service connect config. The private service connection
+       * is available only for Optimized storage type, not for embedding
+       * management now. If
        * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
        * set to true, customers will use private service connection to send
        * request. Otherwise, the connection will set to public endpoint.
@@ -3215,8 +3227,9 @@ public boolean hasPrivateServiceConnectConfig() {
        *
        *
        * <pre>
-       * Optional. Private service connect config.
-       * If
+       * Optional. Private service connect config. The private service connection
+       * is available only for Optimized storage type, not for embedding
+       * management now. If
        * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
        * set to true, customers will use private service connection to send
        * request. Otherwise, the connection will set to public endpoint.
@@ -3244,8 +3257,9 @@ public Builder setPrivateServiceConnectConfig(
        *
        *
        * <pre>
-       * Optional. Private service connect config.
-       * If
+       * Optional. Private service connect config. The private service connection
+       * is available only for Optimized storage type, not for embedding
+       * management now. If
        * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
        * set to true, customers will use private service connection to send
        * request. Otherwise, the connection will set to public endpoint.
@@ -3270,8 +3284,9 @@ public Builder setPrivateServiceConnectConfig(
        *
        *
        * <pre>
-       * Optional. Private service connect config.
-       * If
+       * Optional. Private service connect config. The private service connection
+       * is available only for Optimized storage type, not for embedding
+       * management now. If
        * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
        * set to true, customers will use private service connection to send
        * request. Otherwise, the connection will set to public endpoint.
@@ -3304,8 +3319,9 @@ public Builder mergePrivateServiceConnectConfig(
        *
        *
        * <pre>
-       * Optional. Private service connect config.
-       * If
+       * Optional. Private service connect config. The private service connection
+       * is available only for Optimized storage type, not for embedding
+       * management now. If
        * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
        * set to true, customers will use private service connection to send
        * request. Otherwise, the connection will set to public endpoint.
@@ -3329,8 +3345,9 @@ public Builder clearPrivateServiceConnectConfig() {
        *
        *
        * <pre>
-       * Optional. Private service connect config.
-       * If
+       * Optional. Private service connect config. The private service connection
+       * is available only for Optimized storage type, not for embedding
+       * management now. If
        * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
        * set to true, customers will use private service connection to send
        * request. Otherwise, the connection will set to public endpoint.
@@ -3350,8 +3367,9 @@ public Builder clearPrivateServiceConnectConfig() {
        *
        *
        * <pre>
-       * Optional. Private service connect config.
-       * If
+       * Optional. Private service connect config. The private service connection
+       * is available only for Optimized storage type, not for embedding
+       * management now. If
        * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
        * set to true, customers will use private service connection to send
        * request. Otherwise, the connection will set to public endpoint.
@@ -3375,8 +3393,9 @@ public Builder clearPrivateServiceConnectConfig() {
        *
        *
        * <pre>
-       * Optional. Private service connect config.
-       * If
+       * Optional. Private service connect config. The private service connection
+       * is available only for Optimized storage type, not for embedding
+       * management now. If
        * [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
        * set to true, customers will use private service connection to send
        * request. Otherwise, the connection will set to public endpoint.
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOrBuilder.java
index d746e75abc77..accd7b96611e 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/FeatureOrBuilder.java
@@ -610,7 +610,7 @@ com.google.cloud.aiplatform.v1beta1.Feature.MonitoringStatsAnomaly getMonitoring
    *
    * <pre>
    * Only applicable for Vertex AI Feature Store.
-   * The name of the BigQuery Table/View columnn hosting data for this version.
+   * The name of the BigQuery Table/View column hosting data for this version.
    * If no value is provided, will use feature_id.
    * </pre>
    *
@@ -624,7 +624,7 @@ com.google.cloud.aiplatform.v1beta1.Feature.MonitoringStatsAnomaly getMonitoring
    *
    * <pre>
    * Only applicable for Vertex AI Feature Store.
-   * The name of the BigQuery Table/View columnn hosting data for this version.
+   * The name of the BigQuery Table/View column hosting data for this version.
    * If no value is provided, will use feature_id.
    * </pre>
    *
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceProto.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceProto.java
index 8eab332a5bc3..f2080b3ae8a5 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceProto.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/LlmUtilityServiceProto.java
@@ -53,31 +53,40 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "form.v1beta1\032\034google/api/annotations.pro"
           + "to\032\027google/api/client.proto\032\037google/api/"
           + "field_behavior.proto\032\031google/api/resourc"
-          + "e.proto\032\034google/protobuf/struct.proto\"\206\001"
-          + "\n\024ComputeTokensRequest\022=\n\010endpoint\030\001 \001(\t"
-          + "B+\342A\001\002\372A$\n\"aiplatform.googleapis.com/End"
-          + "point\022/\n\tinstances\030\002 \003(\0132\026.google.protob"
-          + "uf.ValueB\004\342A\001\002\"/\n\nTokensInfo\022\016\n\006tokens\030\001"
-          + " \003(\014\022\021\n\ttoken_ids\030\002 \003(\003\"Y\n\025ComputeTokens"
-          + "Response\022@\n\013tokens_info\030\001 \003(\0132+.google.c"
-          + "loud.aiplatform.v1beta1.TokensInfo2\240\003\n\021L"
-          + "lmUtilityService\022\273\002\n\rComputeTokens\0225.goo"
-          + "gle.cloud.aiplatform.v1beta1.ComputeToke"
-          + "nsRequest\0326.google.cloud.aiplatform.v1be"
-          + "ta1.ComputeTokensResponse\"\272\001\332A\022endpoint,"
-          + "instances\202\323\344\223\002\236\001\"D/v1beta1/{endpoint=pro"
-          + "jects/*/locations/*/endpoints/*}:compute"
-          + "Tokens:\001*ZS\"N/v1beta1/{endpoint=projects"
-          + "/*/locations/*/publishers/*/models/*}:co"
-          + "mputeTokens:\001*\032M\312A\031aiplatform.googleapis"
-          + ".com\322A.https://www.googleapis.com/auth/c"
-          + "loud-platformB\355\001\n#com.google.cloud.aipla"
-          + "tform.v1beta1B\026LlmUtilityServiceProtoP\001Z"
-          + "Ccloud.google.com/go/aiplatform/apiv1bet"
-          + "a1/aiplatformpb;aiplatformpb\252\002\037Google.Cl"
-          + "oud.AIPlatform.V1Beta1\312\002\037Google\\Cloud\\AI"
-          + "Platform\\V1beta1\352\002\"Google::Cloud::AIPlat"
-          + "form::V1beta1b\006proto3"
+          + "e.proto\0328google/cloud/aiplatform/v1beta1"
+          + "/prediction_service.proto\032\034google/protob"
+          + "uf/struct.proto\"\206\001\n\024ComputeTokensRequest"
+          + "\022=\n\010endpoint\030\001 \001(\tB+\342A\001\002\372A$\n\"aiplatform."
+          + "googleapis.com/Endpoint\022/\n\tinstances\030\002 \003"
+          + "(\0132\026.google.protobuf.ValueB\004\342A\001\002\"/\n\nToke"
+          + "nsInfo\022\016\n\006tokens\030\001 \003(\014\022\021\n\ttoken_ids\030\002 \003("
+          + "\003\"Y\n\025ComputeTokensResponse\022@\n\013tokens_inf"
+          + "o\030\001 \003(\0132+.google.cloud.aiplatform.v1beta"
+          + "1.TokensInfo2\324\005\n\021LlmUtilityService\022\261\002\n\013C"
+          + "ountTokens\0223.google.cloud.aiplatform.v1b"
+          + "eta1.CountTokensRequest\0324.google.cloud.a"
+          + "iplatform.v1beta1.CountTokensResponse\"\266\001"
+          + "\332A\022endpoint,instances\202\323\344\223\002\232\001\"B/v1beta1/{"
+          + "endpoint=projects/*/locations/*/endpoint"
+          + "s/*}:countTokens:\001*ZQ\"L/v1beta1/{endpoin"
+          + "t=projects/*/locations/*/publishers/*/mo"
+          + "dels/*}:countTokens:\001*\022\273\002\n\rComputeTokens"
+          + "\0225.google.cloud.aiplatform.v1beta1.Compu"
+          + "teTokensRequest\0326.google.cloud.aiplatfor"
+          + "m.v1beta1.ComputeTokensResponse\"\272\001\332A\022end"
+          + "point,instances\202\323\344\223\002\236\001\"D/v1beta1/{endpoi"
+          + "nt=projects/*/locations/*/endpoints/*}:c"
+          + "omputeTokens:\001*ZS\"N/v1beta1/{endpoint=pr"
+          + "ojects/*/locations/*/publishers/*/models"
+          + "/*}:computeTokens:\001*\032M\312A\031aiplatform.goog"
+          + "leapis.com\322A.https://www.googleapis.com/"
+          + "auth/cloud-platformB\355\001\n#com.google.cloud"
+          + ".aiplatform.v1beta1B\026LlmUtilityServicePr"
+          + "otoP\001ZCcloud.google.com/go/aiplatform/ap"
+          + "iv1beta1/aiplatformpb;aiplatformpb\252\002\037Goo"
+          + "gle.Cloud.AIPlatform.V1Beta1\312\002\037Google\\Cl"
+          + "oud\\AIPlatform\\V1beta1\352\002\"Google::Cloud::"
+          + "AIPlatform::V1beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -87,6 +96,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               com.google.api.ClientProto.getDescriptor(),
               com.google.api.FieldBehaviorProto.getDescriptor(),
               com.google.api.ResourceProto.getDescriptor(),
+              com.google.cloud.aiplatform.v1beta1.PredictionServiceProto.getDescriptor(),
               com.google.protobuf.StructProto.getDescriptor(),
             });
     internal_static_google_cloud_aiplatform_v1beta1_ComputeTokensRequest_descriptor =
@@ -127,6 +137,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.api.ClientProto.getDescriptor();
     com.google.api.FieldBehaviorProto.getDescriptor();
     com.google.api.ResourceProto.getDescriptor();
+    com.google.cloud.aiplatform.v1beta1.PredictionServiceProto.getDescriptor();
     com.google.protobuf.StructProto.getDescriptor();
   }
 
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ModelEvaluation.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ModelEvaluation.java
index ecfa2c81c74c..02d6ee2ea466 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ModelEvaluation.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ModelEvaluation.java
@@ -3046,7 +3046,7 @@ public int getExplanationSpecsCount() {
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
@@ -3064,7 +3064,7 @@ public boolean hasMetadata() {
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
@@ -3082,7 +3082,7 @@ public com.google.protobuf.Value getMetadata() {
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
@@ -5426,7 +5426,7 @@ public Builder removeExplanationSpecs(int index) {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -5443,7 +5443,7 @@ public boolean hasMetadata() {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -5464,7 +5464,7 @@ public com.google.protobuf.Value getMetadata() {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -5489,7 +5489,7 @@ public Builder setMetadata(com.google.protobuf.Value value) {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -5511,7 +5511,7 @@ public Builder setMetadata(com.google.protobuf.Value.Builder builderForValue) {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -5539,7 +5539,7 @@ public Builder mergeMetadata(com.google.protobuf.Value value) {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -5561,7 +5561,7 @@ public Builder clearMetadata() {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -5578,7 +5578,7 @@ public com.google.protobuf.Value.Builder getMetadataBuilder() {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
@@ -5597,7 +5597,7 @@ public com.google.protobuf.ValueOrBuilder getMetadataOrBuilder() {
      * The metadata of the ModelEvaluation.
      * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
      * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-     * "evaluation_dataset_path".
+     * "evaluation_dataset_path", "row_based_metrics_path".
      * </pre>
      *
      * <code>.google.protobuf.Value metadata = 11;</code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ModelEvaluationOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ModelEvaluationOrBuilder.java
index 8b56a2d03ad1..3f0154f50ea2 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ModelEvaluationOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/ModelEvaluationOrBuilder.java
@@ -373,7 +373,7 @@ public interface ModelEvaluationOrBuilder
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
@@ -388,7 +388,7 @@ public interface ModelEvaluationOrBuilder
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
@@ -403,7 +403,7 @@ public interface ModelEvaluationOrBuilder
    * The metadata of the ModelEvaluation.
    * For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
    * structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-   * "evaluation_dataset_path".
+   * "evaluation_dataset_path", "row_based_metrics_path".
    * </pre>
    *
    * <code>.google.protobuf.Value metadata = 11;</code>
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/PersistentResource.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/PersistentResource.java
index c60b8bb68c80..ba97e86f138b 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/PersistentResource.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/PersistentResource.java
@@ -116,7 +116,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * <pre>
-     * The RUNNING state indicates the persistent resources is healthy and fully
+     * The RUNNING state indicates the persistent resource is healthy and fully
      * usable.
      * </pre>
      *
@@ -127,7 +127,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * <pre>
-     * The STOPPING state indicates the persistent resources is being deleted.
+     * The STOPPING state indicates the persistent resource is being deleted.
      * </pre>
      *
      * <code>STOPPING = 4;</code>
@@ -137,7 +137,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * <pre>
-     * The ERROR state indicates the persistent resources may be unusable.
+     * The ERROR state indicates the persistent resource may be unusable.
      * Details can be found in the `error` field.
      * </pre>
      *
@@ -172,7 +172,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * <pre>
-     * The RUNNING state indicates the persistent resources is healthy and fully
+     * The RUNNING state indicates the persistent resource is healthy and fully
      * usable.
      * </pre>
      *
@@ -183,7 +183,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * <pre>
-     * The STOPPING state indicates the persistent resources is being deleted.
+     * The STOPPING state indicates the persistent resource is being deleted.
      * </pre>
      *
      * <code>STOPPING = 4;</code>
@@ -193,7 +193,7 @@ public enum State implements com.google.protobuf.ProtocolMessageEnum {
      *
      *
      * <pre>
-     * The ERROR state indicates the persistent resources may be unusable.
+     * The ERROR state indicates the persistent resource may be unusable.
      * Details can be found in the `error` field.
      * </pre>
      *
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/Scheduling.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/Scheduling.java
index ef2cd47749c4..5ed0289f411c 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/Scheduling.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/Scheduling.java
@@ -146,6 +146,65 @@ public boolean getDisableRetries() {
     return disableRetries_;
   }
 
+  public static final int MAX_WAIT_DURATION_FIELD_NUMBER = 6;
+  private com.google.protobuf.Duration maxWaitDuration_;
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return Whether the maxWaitDuration field is set.
+   */
+  @java.lang.Override
+  public boolean hasMaxWaitDuration() {
+    return maxWaitDuration_ != null;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return The maxWaitDuration.
+   */
+  @java.lang.Override
+  public com.google.protobuf.Duration getMaxWaitDuration() {
+    return maxWaitDuration_ == null
+        ? com.google.protobuf.Duration.getDefaultInstance()
+        : maxWaitDuration_;
+  }
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   */
+  @java.lang.Override
+  public com.google.protobuf.DurationOrBuilder getMaxWaitDurationOrBuilder() {
+    return maxWaitDuration_ == null
+        ? com.google.protobuf.Duration.getDefaultInstance()
+        : maxWaitDuration_;
+  }
+
   private byte memoizedIsInitialized = -1;
 
   @java.lang.Override
@@ -169,6 +228,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
     if (disableRetries_ != false) {
       output.writeBool(5, disableRetries_);
     }
+    if (maxWaitDuration_ != null) {
+      output.writeMessage(6, getMaxWaitDuration());
+    }
     getUnknownFields().writeTo(output);
   }
 
@@ -187,6 +249,9 @@ public int getSerializedSize() {
     if (disableRetries_ != false) {
       size += com.google.protobuf.CodedOutputStream.computeBoolSize(5, disableRetries_);
     }
+    if (maxWaitDuration_ != null) {
+      size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getMaxWaitDuration());
+    }
     size += getUnknownFields().getSerializedSize();
     memoizedSize = size;
     return size;
@@ -209,6 +274,10 @@ public boolean equals(final java.lang.Object obj) {
     }
     if (getRestartJobOnWorkerRestart() != other.getRestartJobOnWorkerRestart()) return false;
     if (getDisableRetries() != other.getDisableRetries()) return false;
+    if (hasMaxWaitDuration() != other.hasMaxWaitDuration()) return false;
+    if (hasMaxWaitDuration()) {
+      if (!getMaxWaitDuration().equals(other.getMaxWaitDuration())) return false;
+    }
     if (!getUnknownFields().equals(other.getUnknownFields())) return false;
     return true;
   }
@@ -228,6 +297,10 @@ public int hashCode() {
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getRestartJobOnWorkerRestart());
     hash = (37 * hash) + DISABLE_RETRIES_FIELD_NUMBER;
     hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getDisableRetries());
+    if (hasMaxWaitDuration()) {
+      hash = (37 * hash) + MAX_WAIT_DURATION_FIELD_NUMBER;
+      hash = (53 * hash) + getMaxWaitDuration().hashCode();
+    }
     hash = (29 * hash) + getUnknownFields().hashCode();
     memoizedHashCode = hash;
     return hash;
@@ -374,6 +447,11 @@ public Builder clear() {
       }
       restartJobOnWorkerRestart_ = false;
       disableRetries_ = false;
+      maxWaitDuration_ = null;
+      if (maxWaitDurationBuilder_ != null) {
+        maxWaitDurationBuilder_.dispose();
+        maxWaitDurationBuilder_ = null;
+      }
       return this;
     }
 
@@ -419,6 +497,10 @@ private void buildPartial0(com.google.cloud.aiplatform.v1beta1.Scheduling result
       if (((from_bitField0_ & 0x00000004) != 0)) {
         result.disableRetries_ = disableRetries_;
       }
+      if (((from_bitField0_ & 0x00000008) != 0)) {
+        result.maxWaitDuration_ =
+            maxWaitDurationBuilder_ == null ? maxWaitDuration_ : maxWaitDurationBuilder_.build();
+      }
     }
 
     @java.lang.Override
@@ -475,6 +557,9 @@ public Builder mergeFrom(com.google.cloud.aiplatform.v1beta1.Scheduling other) {
       if (other.getDisableRetries() != false) {
         setDisableRetries(other.getDisableRetries());
       }
+      if (other.hasMaxWaitDuration()) {
+        mergeMaxWaitDuration(other.getMaxWaitDuration());
+      }
       this.mergeUnknownFields(other.getUnknownFields());
       onChanged();
       return this;
@@ -519,6 +604,12 @@ public Builder mergeFrom(
                 bitField0_ |= 0x00000004;
                 break;
               } // case 40
+            case 50:
+              {
+                input.readMessage(getMaxWaitDurationFieldBuilder().getBuilder(), extensionRegistry);
+                bitField0_ |= 0x00000008;
+                break;
+              } // case 50
             default:
               {
                 if (!super.parseUnknownField(input, extensionRegistry, tag)) {
@@ -835,6 +926,216 @@ public Builder clearDisableRetries() {
       return this;
     }
 
+    private com.google.protobuf.Duration maxWaitDuration_;
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Duration,
+            com.google.protobuf.Duration.Builder,
+            com.google.protobuf.DurationOrBuilder>
+        maxWaitDurationBuilder_;
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     *
+     * @return Whether the maxWaitDuration field is set.
+     */
+    public boolean hasMaxWaitDuration() {
+      return ((bitField0_ & 0x00000008) != 0);
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     *
+     * @return The maxWaitDuration.
+     */
+    public com.google.protobuf.Duration getMaxWaitDuration() {
+      if (maxWaitDurationBuilder_ == null) {
+        return maxWaitDuration_ == null
+            ? com.google.protobuf.Duration.getDefaultInstance()
+            : maxWaitDuration_;
+      } else {
+        return maxWaitDurationBuilder_.getMessage();
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder setMaxWaitDuration(com.google.protobuf.Duration value) {
+      if (maxWaitDurationBuilder_ == null) {
+        if (value == null) {
+          throw new NullPointerException();
+        }
+        maxWaitDuration_ = value;
+      } else {
+        maxWaitDurationBuilder_.setMessage(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder setMaxWaitDuration(com.google.protobuf.Duration.Builder builderForValue) {
+      if (maxWaitDurationBuilder_ == null) {
+        maxWaitDuration_ = builderForValue.build();
+      } else {
+        maxWaitDurationBuilder_.setMessage(builderForValue.build());
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder mergeMaxWaitDuration(com.google.protobuf.Duration value) {
+      if (maxWaitDurationBuilder_ == null) {
+        if (((bitField0_ & 0x00000008) != 0)
+            && maxWaitDuration_ != null
+            && maxWaitDuration_ != com.google.protobuf.Duration.getDefaultInstance()) {
+          getMaxWaitDurationBuilder().mergeFrom(value);
+        } else {
+          maxWaitDuration_ = value;
+        }
+      } else {
+        maxWaitDurationBuilder_.mergeFrom(value);
+      }
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public Builder clearMaxWaitDuration() {
+      bitField0_ = (bitField0_ & ~0x00000008);
+      maxWaitDuration_ = null;
+      if (maxWaitDurationBuilder_ != null) {
+        maxWaitDurationBuilder_.dispose();
+        maxWaitDurationBuilder_ = null;
+      }
+      onChanged();
+      return this;
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public com.google.protobuf.Duration.Builder getMaxWaitDurationBuilder() {
+      bitField0_ |= 0x00000008;
+      onChanged();
+      return getMaxWaitDurationFieldBuilder().getBuilder();
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    public com.google.protobuf.DurationOrBuilder getMaxWaitDurationOrBuilder() {
+      if (maxWaitDurationBuilder_ != null) {
+        return maxWaitDurationBuilder_.getMessageOrBuilder();
+      } else {
+        return maxWaitDuration_ == null
+            ? com.google.protobuf.Duration.getDefaultInstance()
+            : maxWaitDuration_;
+      }
+    }
+    /**
+     *
+     *
+     * <pre>
+     * Optional. This is the maximum time a user will wait in the QRM queue for
+     * resources. Default is 1 day
+     * </pre>
+     *
+     * <code>
+     * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+     * </code>
+     */
+    private com.google.protobuf.SingleFieldBuilderV3<
+            com.google.protobuf.Duration,
+            com.google.protobuf.Duration.Builder,
+            com.google.protobuf.DurationOrBuilder>
+        getMaxWaitDurationFieldBuilder() {
+      if (maxWaitDurationBuilder_ == null) {
+        maxWaitDurationBuilder_ =
+            new com.google.protobuf.SingleFieldBuilderV3<
+                com.google.protobuf.Duration,
+                com.google.protobuf.Duration.Builder,
+                com.google.protobuf.DurationOrBuilder>(
+                getMaxWaitDuration(), getParentForChildren(), isClean());
+        maxWaitDuration_ = null;
+      }
+      return maxWaitDurationBuilder_;
+    }
+
     @java.lang.Override
     public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
       return super.setUnknownFields(unknownFields);
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SchedulingOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SchedulingOrBuilder.java
index 247880393f28..87df89e4498f 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SchedulingOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SchedulingOrBuilder.java
@@ -87,4 +87,48 @@ public interface SchedulingOrBuilder
    * @return The disableRetries.
    */
   boolean getDisableRetries();
+
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return Whether the maxWaitDuration field is set.
+   */
+  boolean hasMaxWaitDuration();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   *
+   * @return The maxWaitDuration.
+   */
+  com.google.protobuf.Duration getMaxWaitDuration();
+  /**
+   *
+   *
+   * <pre>
+   * Optional. This is the maximum time a user will wait in the QRM queue for
+   * resources. Default is 1 day
+   * </pre>
+   *
+   * <code>
+   * .google.protobuf.Duration max_wait_duration = 6 [(.google.api.field_behavior) = OPTIONAL];
+   * </code>
+   */
+  com.google.protobuf.DurationOrBuilder getMaxWaitDurationOrBuilder();
 }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SearchDataItemsRequest.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SearchDataItemsRequest.java
index e739cc599640..a4845d2f0dc2 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SearchDataItemsRequest.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SearchDataItemsRequest.java
@@ -1233,7 +1233,7 @@ public com.google.protobuf.ByteString getDatasetBytes() {
    * </code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.saved_query is deprecated.
-   *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=628
+   *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=629
    * @return The savedQuery.
    */
   @java.lang.Override
@@ -1263,7 +1263,7 @@ public java.lang.String getSavedQuery() {
    * </code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.saved_query is deprecated.
-   *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=628
+   *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=629
    * @return The bytes for savedQuery.
    */
   @java.lang.Override
@@ -1428,7 +1428,7 @@ public com.google.protobuf.ByteString getDataItemFilterBytes() {
    * <code>string annotations_filter = 5 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.annotations_filter is
-   *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=659
+   *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=660
    * @return The annotationsFilter.
    */
   @java.lang.Override
@@ -1456,7 +1456,7 @@ public java.lang.String getAnnotationsFilter() {
    * <code>string annotations_filter = 5 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.annotations_filter is
-   *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=659
+   *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=660
    * @return The bytes for annotationsFilter.
    */
   @java.lang.Override
@@ -1656,7 +1656,7 @@ public int getPageSize() {
    * <code>string order_by = 9 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.order_by is deprecated. See
-   *     google/cloud/aiplatform/v1beta1/dataset_service.proto;l=683
+   *     google/cloud/aiplatform/v1beta1/dataset_service.proto;l=684
    * @return The orderBy.
    */
   @java.lang.Override
@@ -1683,7 +1683,7 @@ public java.lang.String getOrderBy() {
    * <code>string order_by = 9 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.order_by is deprecated. See
-   *     google/cloud/aiplatform/v1beta1/dataset_service.proto;l=683
+   *     google/cloud/aiplatform/v1beta1/dataset_service.proto;l=684
    * @return The bytes for orderBy.
    */
   @java.lang.Override
@@ -2992,7 +2992,7 @@ public Builder setDatasetBytes(com.google.protobuf.ByteString value) {
      * </code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.saved_query is deprecated.
-     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=628
+     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=629
      * @return The savedQuery.
      */
     @java.lang.Deprecated
@@ -3021,7 +3021,7 @@ public java.lang.String getSavedQuery() {
      * </code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.saved_query is deprecated.
-     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=628
+     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=629
      * @return The bytes for savedQuery.
      */
     @java.lang.Deprecated
@@ -3050,7 +3050,7 @@ public com.google.protobuf.ByteString getSavedQueryBytes() {
      * </code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.saved_query is deprecated.
-     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=628
+     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=629
      * @param value The savedQuery to set.
      * @return This builder for chaining.
      */
@@ -3078,7 +3078,7 @@ public Builder setSavedQuery(java.lang.String value) {
      * </code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.saved_query is deprecated.
-     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=628
+     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=629
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
@@ -3102,7 +3102,7 @@ public Builder clearSavedQuery() {
      * </code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.saved_query is deprecated.
-     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=628
+     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=629
      * @param value The bytes for savedQuery to set.
      * @return This builder for chaining.
      */
@@ -3418,7 +3418,7 @@ public Builder setDataItemFilterBytes(com.google.protobuf.ByteString value) {
      * <code>string annotations_filter = 5 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.annotations_filter is
-     *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=659
+     *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=660
      * @return The annotationsFilter.
      */
     @java.lang.Deprecated
@@ -3445,7 +3445,7 @@ public java.lang.String getAnnotationsFilter() {
      * <code>string annotations_filter = 5 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.annotations_filter is
-     *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=659
+     *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=660
      * @return The bytes for annotationsFilter.
      */
     @java.lang.Deprecated
@@ -3472,7 +3472,7 @@ public com.google.protobuf.ByteString getAnnotationsFilterBytes() {
      * <code>string annotations_filter = 5 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.annotations_filter is
-     *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=659
+     *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=660
      * @param value The annotationsFilter to set.
      * @return This builder for chaining.
      */
@@ -3498,7 +3498,7 @@ public Builder setAnnotationsFilter(java.lang.String value) {
      * <code>string annotations_filter = 5 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.annotations_filter is
-     *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=659
+     *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=660
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
@@ -3520,7 +3520,7 @@ public Builder clearAnnotationsFilter() {
      * <code>string annotations_filter = 5 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.annotations_filter is
-     *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=659
+     *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=660
      * @param value The bytes for annotationsFilter to set.
      * @return This builder for chaining.
      */
@@ -4061,7 +4061,7 @@ public Builder clearPageSize() {
      * <code>string order_by = 9 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.order_by is deprecated.
-     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=683
+     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=684
      * @return The orderBy.
      */
     @java.lang.Deprecated
@@ -4087,7 +4087,7 @@ public java.lang.String getOrderBy() {
      * <code>string order_by = 9 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.order_by is deprecated.
-     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=683
+     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=684
      * @return The bytes for orderBy.
      */
     @java.lang.Deprecated
@@ -4113,7 +4113,7 @@ public com.google.protobuf.ByteString getOrderByBytes() {
      * <code>string order_by = 9 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.order_by is deprecated.
-     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=683
+     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=684
      * @param value The orderBy to set.
      * @return This builder for chaining.
      */
@@ -4138,7 +4138,7 @@ public Builder setOrderBy(java.lang.String value) {
      * <code>string order_by = 9 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.order_by is deprecated.
-     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=683
+     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=684
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
@@ -4159,7 +4159,7 @@ public Builder clearOrderBy() {
      * <code>string order_by = 9 [deprecated = true];</code>
      *
      * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.order_by is deprecated.
-     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=683
+     *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=684
      * @param value The bytes for orderBy to set.
      * @return This builder for chaining.
      */
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SearchDataItemsRequestOrBuilder.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SearchDataItemsRequestOrBuilder.java
index 61b469b14102..66e51bba8098 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SearchDataItemsRequestOrBuilder.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/SearchDataItemsRequestOrBuilder.java
@@ -153,7 +153,7 @@ public interface SearchDataItemsRequestOrBuilder
    * </code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.saved_query is deprecated.
-   *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=628
+   *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=629
    * @return The savedQuery.
    */
   @java.lang.Deprecated
@@ -172,7 +172,7 @@ public interface SearchDataItemsRequestOrBuilder
    * </code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.saved_query is deprecated.
-   *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=628
+   *     See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=629
    * @return The bytes for savedQuery.
    */
   @java.lang.Deprecated
@@ -270,7 +270,7 @@ public interface SearchDataItemsRequestOrBuilder
    * <code>string annotations_filter = 5 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.annotations_filter is
-   *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=659
+   *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=660
    * @return The annotationsFilter.
    */
   @java.lang.Deprecated
@@ -287,7 +287,7 @@ public interface SearchDataItemsRequestOrBuilder
    * <code>string annotations_filter = 5 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.annotations_filter is
-   *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=659
+   *     deprecated. See google/cloud/aiplatform/v1beta1/dataset_service.proto;l=660
    * @return The bytes for annotationsFilter.
    */
   @java.lang.Deprecated
@@ -438,7 +438,7 @@ public interface SearchDataItemsRequestOrBuilder
    * <code>string order_by = 9 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.order_by is deprecated. See
-   *     google/cloud/aiplatform/v1beta1/dataset_service.proto;l=683
+   *     google/cloud/aiplatform/v1beta1/dataset_service.proto;l=684
    * @return The orderBy.
    */
   @java.lang.Deprecated
@@ -454,7 +454,7 @@ public interface SearchDataItemsRequestOrBuilder
    * <code>string order_by = 9 [deprecated = true];</code>
    *
    * @deprecated google.cloud.aiplatform.v1beta1.SearchDataItemsRequest.order_by is deprecated. See
-   *     google/cloud/aiplatform/v1beta1/dataset_service.proto;l=683
+   *     google/cloud/aiplatform/v1beta1/dataset_service.proto;l=684
    * @return The bytes for orderBy.
    */
   @java.lang.Deprecated
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/TensorboardServiceProto.java b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/TensorboardServiceProto.java
index bdcb50c72878..a0c8733e7872 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/TensorboardServiceProto.java
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/java/com/google/cloud/aiplatform/v1beta1/TensorboardServiceProto.java
@@ -426,7 +426,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "rm.v1beta1.GenericOperationMetadata\"y\n\"U"
           + "pdateTensorboardOperationMetadata\022S\n\020gen"
           + "eric_metadata\030\001 \001(\01329.google.cloud.aipla"
-          + "tform.v1beta1.GenericOperationMetadata2\367"
+          + "tform.v1beta1.GenericOperationMetadata2\304"
           + "A\n\022TensorboardService\022\203\002\n\021CreateTensorbo"
           + "ard\0229.google.cloud.aiplatform.v1beta1.Cr"
           + "eateTensorboardRequest\032\035.google.longrunn"
@@ -543,108 +543,106 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "otobuf.Empty\022\027DeleteOperationMetadata\332A\004"
           + "name\202\323\344\223\002L*J/v1beta1/{name=projects/*/lo"
           + "cations/*/tensorboards/*/experiments/*/r"
-          + "uns/*}\022\272\002\n BatchCreateTensorboardTimeSer"
+          + "uns/*}\022\247\002\n BatchCreateTensorboardTimeSer"
           + "ies\022H.google.cloud.aiplatform.v1beta1.Ba"
           + "tchCreateTensorboardTimeSeriesRequest\032I."
           + "google.cloud.aiplatform.v1beta1.BatchCre"
-          + "ateTensorboardTimeSeriesResponse\"\200\001\332A\017pa"
-          + "rent,requests\202\323\344\223\002h\"c/v1beta1/{parent=pr"
-          + "ojects/*/locations/*/tensorboards/*/expe"
-          + "riments/*}/runs/*/timeSeries:batchCreate"
-          + ":\001*\022\266\002\n\033CreateTensorboardTimeSeries\022C.go"
-          + "ogle.cloud.aiplatform.v1beta1.CreateTens"
-          + "orboardTimeSeriesRequest\0326.google.cloud."
-          + "aiplatform.v1beta1.TensorboardTimeSeries"
-          + "\"\231\001\332A\036parent,tensorboard_time_series\202\323\344\223"
-          + "\002r\"W/v1beta1/{parent=projects/*/location"
-          + "s/*/tensorboards/*/experiments/*/runs/*}"
-          + "/timeSeries:\027tensorboard_time_series\022\374\001\n"
-          + "\030GetTensorboardTimeSeries\022@.google.cloud"
-          + ".aiplatform.v1beta1.GetTensorboardTimeSe"
-          + "riesRequest\0326.google.cloud.aiplatform.v1"
-          + "beta1.TensorboardTimeSeries\"f\332A\004name\202\323\344\223"
-          + "\002Y\022W/v1beta1/{name=projects/*/locations/"
-          + "*/tensorboards/*/experiments/*/runs/*/ti"
-          + "meSeries/*}\022\324\002\n\033UpdateTensorboardTimeSer"
-          + "ies\022C.google.cloud.aiplatform.v1beta1.Up"
-          + "dateTensorboardTimeSeriesRequest\0326.googl"
-          + "e.cloud.aiplatform.v1beta1.TensorboardTi"
-          + "meSeries\"\267\001\332A#tensorboard_time_series,up"
-          + "date_mask\202\323\344\223\002\212\0012o/v1beta1/{tensorboard_"
-          + "time_series.name=projects/*/locations/*/"
-          + "tensorboards/*/experiments/*/runs/*/time"
-          + "Series/*}:\027tensorboard_time_series\022\214\002\n\031L"
-          + "istTensorboardTimeSeries\022A.google.cloud."
-          + "aiplatform.v1beta1.ListTensorboardTimeSe"
-          + "riesRequest\032B.google.cloud.aiplatform.v1"
-          + "beta1.ListTensorboardTimeSeriesResponse\""
-          + "h\332A\006parent\202\323\344\223\002Y\022W/v1beta1/{parent=proje"
-          + "cts/*/locations/*/tensorboards/*/experim"
-          + "ents/*/runs/*}/timeSeries\022\235\002\n\033DeleteTens"
-          + "orboardTimeSeries\022C.google.cloud.aiplatf"
-          + "orm.v1beta1.DeleteTensorboardTimeSeriesR"
-          + "equest\032\035.google.longrunning.Operation\"\231\001"
-          + "\312A0\n\025google.protobuf.Empty\022\027DeleteOperat"
-          + "ionMetadata\332A\004name\202\323\344\223\002Y*W/v1beta1/{name"
-          + "=projects/*/locations/*/tensorboards/*/e"
-          + "xperiments/*/runs/*/timeSeries/*}\022\273\002\n\"Ba"
-          + "tchReadTensorboardTimeSeriesData\022J.googl"
-          + "e.cloud.aiplatform.v1beta1.BatchReadTens"
-          + "orboardTimeSeriesDataRequest\032K.google.cl"
-          + "oud.aiplatform.v1beta1.BatchReadTensorbo"
-          + "ardTimeSeriesDataResponse\"|\332A\013tensorboar"
-          + "d\202\323\344\223\002h\022f/v1beta1/{tensorboard=projects/"
-          + "*/locations/*/tensorboards/*}/experiment"
-          + "s/*/runs/*/timeSeries:batchRead\022\302\002\n\035Read"
-          + "TensorboardTimeSeriesData\022E.google.cloud"
-          + ".aiplatform.v1beta1.ReadTensorboardTimeS"
-          + "eriesDataRequest\032F.google.cloud.aiplatfo"
-          + "rm.v1beta1.ReadTensorboardTimeSeriesData"
-          + "Response\"\221\001\332A\027tensorboard_time_series\202\323\344"
-          + "\223\002q\022o/v1beta1/{tensorboard_time_series=p"
-          + "rojects/*/locations/*/tensorboards/*/exp"
-          + "eriments/*/runs/*/timeSeries/*}:read\022\242\002\n"
-          + "\027ReadTensorboardBlobData\022?.google.cloud."
-          + "aiplatform.v1beta1.ReadTensorboardBlobDa"
-          + "taRequest\032@.google.cloud.aiplatform.v1be"
-          + "ta1.ReadTensorboardBlobDataResponse\"\201\001\332A"
-          + "\013time_series\202\323\344\223\002m\022k/v1beta1/{time_serie"
-          + "s=projects/*/locations/*/tensorboards/*/"
-          + "experiments/*/runs/*/timeSeries/*}:readB"
-          + "lobData0\001\022\313\002\n\036WriteTensorboardExperiment"
-          + "Data\022F.google.cloud.aiplatform.v1beta1.W"
-          + "riteTensorboardExperimentDataRequest\032G.g"
-          + "oogle.cloud.aiplatform.v1beta1.WriteTens"
-          + "orboardExperimentDataResponse\"\227\001\332A.tenso"
-          + "rboard_experiment,write_run_data_request"
-          + "s\202\323\344\223\002`\"[/v1beta1/{tensorboard_experimen"
+          + "ateTensorboardTimeSeriesResponse\"n\332A\017par"
+          + "ent,requests\202\323\344\223\002V\"Q/v1beta1/{parent=pro"
+          + "jects/*/locations/*/tensorboards/*/exper"
+          + "iments/*}:batchCreate:\001*\022\266\002\n\033CreateTenso"
+          + "rboardTimeSeries\022C.google.cloud.aiplatfo"
+          + "rm.v1beta1.CreateTensorboardTimeSeriesRe"
+          + "quest\0326.google.cloud.aiplatform.v1beta1."
+          + "TensorboardTimeSeries\"\231\001\332A\036parent,tensor"
+          + "board_time_series\202\323\344\223\002r\"W/v1beta1/{paren"
           + "t=projects/*/locations/*/tensorboards/*/"
-          + "experiments/*}:write:\001*\022\250\002\n\027WriteTensorb"
-          + "oardRunData\022?.google.cloud.aiplatform.v1"
-          + "beta1.WriteTensorboardRunDataRequest\032@.g"
-          + "oogle.cloud.aiplatform.v1beta1.WriteTens"
-          + "orboardRunDataResponse\"\211\001\332A tensorboard_"
-          + "run,time_series_data\202\323\344\223\002`\"[/v1beta1/{te"
-          + "nsorboard_run=projects/*/locations/*/ten"
-          + "sorboards/*/experiments/*/runs/*}:write:"
-          + "\001*\022\344\002\n\037ExportTensorboardTimeSeriesData\022G"
-          + ".google.cloud.aiplatform.v1beta1.ExportT"
-          + "ensorboardTimeSeriesDataRequest\032H.google"
-          + ".cloud.aiplatform.v1beta1.ExportTensorbo"
-          + "ardTimeSeriesDataResponse\"\255\001\332A\027tensorboa",
-      "rd_time_series\202\323\344\223\002\214\001\"\206\001/v1beta1/{tensor"
-          + "board_time_series=projects/*/locations/*"
-          + "/tensorboards/*/experiments/*/runs/*/tim"
-          + "eSeries/*}:exportTensorboardTimeSeries:\001"
-          + "*\032M\312A\031aiplatform.googleapis.com\322A.https:"
-          + "//www.googleapis.com/auth/cloud-platform"
-          + "B\356\001\n#com.google.cloud.aiplatform.v1beta1"
-          + "B\027TensorboardServiceProtoP\001ZCcloud.googl"
-          + "e.com/go/aiplatform/apiv1beta1/aiplatfor"
-          + "mpb;aiplatformpb\252\002\037Google.Cloud.AIPlatfo"
-          + "rm.V1Beta1\312\002\037Google\\Cloud\\AIPlatform\\V1b"
-          + "eta1\352\002\"Google::Cloud::AIPlatform::V1beta"
-          + "1b\006proto3"
+          + "experiments/*/runs/*}/timeSeries:\027tensor"
+          + "board_time_series\022\374\001\n\030GetTensorboardTime"
+          + "Series\022@.google.cloud.aiplatform.v1beta1"
+          + ".GetTensorboardTimeSeriesRequest\0326.googl"
+          + "e.cloud.aiplatform.v1beta1.TensorboardTi"
+          + "meSeries\"f\332A\004name\202\323\344\223\002Y\022W/v1beta1/{name="
+          + "projects/*/locations/*/tensorboards/*/ex"
+          + "periments/*/runs/*/timeSeries/*}\022\324\002\n\033Upd"
+          + "ateTensorboardTimeSeries\022C.google.cloud."
+          + "aiplatform.v1beta1.UpdateTensorboardTime"
+          + "SeriesRequest\0326.google.cloud.aiplatform."
+          + "v1beta1.TensorboardTimeSeries\"\267\001\332A#tenso"
+          + "rboard_time_series,update_mask\202\323\344\223\002\212\0012o/"
+          + "v1beta1/{tensorboard_time_series.name=pr"
+          + "ojects/*/locations/*/tensorboards/*/expe"
+          + "riments/*/runs/*/timeSeries/*}:\027tensorbo"
+          + "ard_time_series\022\214\002\n\031ListTensorboardTimeS"
+          + "eries\022A.google.cloud.aiplatform.v1beta1."
+          + "ListTensorboardTimeSeriesRequest\032B.googl"
+          + "e.cloud.aiplatform.v1beta1.ListTensorboa"
+          + "rdTimeSeriesResponse\"h\332A\006parent\202\323\344\223\002Y\022W/"
+          + "v1beta1/{parent=projects/*/locations/*/t"
+          + "ensorboards/*/experiments/*/runs/*}/time"
+          + "Series\022\235\002\n\033DeleteTensorboardTimeSeries\022C"
+          + ".google.cloud.aiplatform.v1beta1.DeleteT"
+          + "ensorboardTimeSeriesRequest\032\035.google.lon"
+          + "grunning.Operation\"\231\001\312A0\n\025google.protobu"
+          + "f.Empty\022\027DeleteOperationMetadata\332A\004name\202"
+          + "\323\344\223\002Y*W/v1beta1/{name=projects/*/locatio"
+          + "ns/*/tensorboards/*/experiments/*/runs/*"
+          + "/timeSeries/*}\022\233\002\n\"BatchReadTensorboardT"
+          + "imeSeriesData\022J.google.cloud.aiplatform."
+          + "v1beta1.BatchReadTensorboardTimeSeriesDa"
+          + "taRequest\032K.google.cloud.aiplatform.v1be"
+          + "ta1.BatchReadTensorboardTimeSeriesDataRe"
+          + "sponse\"\\\332A\013tensorboard\202\323\344\223\002H\022F/v1beta1/{"
+          + "tensorboard=projects/*/locations/*/tenso"
+          + "rboards/*}:batchRead\022\302\002\n\035ReadTensorboard"
+          + "TimeSeriesData\022E.google.cloud.aiplatform"
+          + ".v1beta1.ReadTensorboardTimeSeriesDataRe"
+          + "quest\032F.google.cloud.aiplatform.v1beta1."
+          + "ReadTensorboardTimeSeriesDataResponse\"\221\001"
+          + "\332A\027tensorboard_time_series\202\323\344\223\002q\022o/v1bet"
+          + "a1/{tensorboard_time_series=projects/*/l"
+          + "ocations/*/tensorboards/*/experiments/*/"
+          + "runs/*/timeSeries/*}:read\022\242\002\n\027ReadTensor"
+          + "boardBlobData\022?.google.cloud.aiplatform."
+          + "v1beta1.ReadTensorboardBlobDataRequest\032@"
+          + ".google.cloud.aiplatform.v1beta1.ReadTen"
+          + "sorboardBlobDataResponse\"\201\001\332A\013time_serie"
+          + "s\202\323\344\223\002m\022k/v1beta1/{time_series=projects/"
+          + "*/locations/*/tensorboards/*/experiments"
+          + "/*/runs/*/timeSeries/*}:readBlobData0\001\022\313"
+          + "\002\n\036WriteTensorboardExperimentData\022F.goog"
+          + "le.cloud.aiplatform.v1beta1.WriteTensorb"
+          + "oardExperimentDataRequest\032G.google.cloud"
+          + ".aiplatform.v1beta1.WriteTensorboardExpe"
+          + "rimentDataResponse\"\227\001\332A.tensorboard_expe"
+          + "riment,write_run_data_requests\202\323\344\223\002`\"[/v"
+          + "1beta1/{tensorboard_experiment=projects/"
+          + "*/locations/*/tensorboards/*/experiments"
+          + "/*}:write:\001*\022\250\002\n\027WriteTensorboardRunData"
+          + "\022?.google.cloud.aiplatform.v1beta1.Write"
+          + "TensorboardRunDataRequest\032@.google.cloud"
+          + ".aiplatform.v1beta1.WriteTensorboardRunD"
+          + "ataResponse\"\211\001\332A tensorboard_run,time_se"
+          + "ries_data\202\323\344\223\002`\"[/v1beta1/{tensorboard_r"
+          + "un=projects/*/locations/*/tensorboards/*"
+          + "/experiments/*/runs/*}:write:\001*\022\344\002\n\037Expo"
+          + "rtTensorboardTimeSeriesData\022G.google.clo"
+          + "ud.aiplatform.v1beta1.ExportTensorboardT"
+          + "imeSeriesDataRequest\032H.google.cloud.aipl"
+          + "atform.v1beta1.ExportTensorboardTimeSeri"
+          + "esDataResponse\"\255\001\332A\027tensorboard_time_ser"
+          + "ies\202\323\344\223\002\214\001\"\206\001/v1beta1/{tensorboard_time_",
+      "series=projects/*/locations/*/tensorboar"
+          + "ds/*/experiments/*/runs/*/timeSeries/*}:"
+          + "exportTensorboardTimeSeries:\001*\032M\312A\031aipla"
+          + "tform.googleapis.com\322A.https://www.googl"
+          + "eapis.com/auth/cloud-platformB\356\001\n#com.go"
+          + "ogle.cloud.aiplatform.v1beta1B\027Tensorboa"
+          + "rdServiceProtoP\001ZCcloud.google.com/go/ai"
+          + "platform/apiv1beta1/aiplatformpb;aiplatf"
+          + "ormpb\252\002\037Google.Cloud.AIPlatform.V1Beta1\312"
+          + "\002\037Google\\Cloud\\AIPlatform\\V1beta1\352\002\"Goog"
+          + "le::Cloud::AIPlatform::V1beta1b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/custom_job.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/custom_job.proto
index 300642aea002..c9d2b58f2138 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/custom_job.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/custom_job.proto
@@ -256,6 +256,26 @@ message CustomJobSpec {
       type: "aiplatform.googleapis.com/Context"
     }
   ];
+
+  // Optional. The name of the Model resources for which to generate a mapping
+  // to artifact URIs. Applicable only to some of the Google-provided custom
+  // jobs. Format: `projects/{project}/locations/{location}/models/{model}`
+  //
+  // In order to retrieve a specific version of the model, also provide
+  // the version ID or version alias.
+  //   Example: `projects/{project}/locations/{location}/models/{model}@2`
+  //              or
+  //            `projects/{project}/locations/{location}/models/{model}@golden`
+  // If no version ID or alias is specified, the "default" version will be
+  // returned. The "default" version alias is created for the first version of
+  // the model, and can be moved to other versions later on. There will be
+  // exactly one default version.
+  repeated string models = 20 [
+    (google.api.field_behavior) = OPTIONAL,
+    (google.api.resource_reference) = {
+      type: "aiplatform.googleapis.com/Model"
+    }
+  ];
 }
 
 // Represents the spec of a worker pool in a job.
@@ -343,4 +363,9 @@ message Scheduling {
   // job starts running. If true, overrides
   // `Scheduling.restart_job_on_worker_restart` to false.
   bool disable_retries = 5 [(google.api.field_behavior) = OPTIONAL];
+
+  // Optional. This is the maximum time a user will wait in the QRM queue for
+  // resources. Default is 1 day
+  google.protobuf.Duration max_wait_duration = 6
+      [(google.api.field_behavior) = OPTIONAL];
 }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/dataset_service.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/dataset_service.proto
index 07831cb76c43..81f763a6272c 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/dataset_service.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/dataset_service.proto
@@ -413,8 +413,9 @@ message ExportDataRequest {
 // [DatasetService.ExportData][google.cloud.aiplatform.v1beta1.DatasetService.ExportData].
 message ExportDataResponse {
   // All of the files that are exported in this export operation. For custom
-  // code training export, only three (training, validation and test) GCS paths
-  // in wildcard format are populated (e.g., gs://.../training-*).
+  // code training export, only three (training, validation and test)
+  // Cloud Storage paths in wildcard format are populated
+  // (for example, gs://.../training-*).
   repeated string exported_files = 1;
 }
 
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature.proto
index 668324a6e891..f5510a91d6c1 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature.proto
@@ -194,7 +194,7 @@ message Feature {
       [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Only applicable for Vertex AI Feature Store.
-  // The name of the BigQuery Table/View columnn hosting data for this version.
+  // The name of the BigQuery Table/View column hosting data for this version.
   // If no value is provided, will use feature_id.
   string version_column_name = 106;
 }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature_online_store.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature_online_store.proto
index 5161ca56be75..a9a94c603341 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature_online_store.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature_online_store.proto
@@ -66,15 +66,18 @@ message FeatureOnlineStore {
 
   // The dedicated serving endpoint for this FeatureOnlineStore. Only need to
   // set when you choose Optimized storage type or enable EmbeddingManagement.
-  // Will use public endpoint by default.
+  // Will use public endpoint by default. Note, for EmbeddingManagement use
+  // case, only [DedicatedServingEndpoint.public_endpoint_domain_name] is
+  // available now.
   message DedicatedServingEndpoint {
     // Output only. This field will be populated with the domain name to use for
     // this FeatureOnlineStore
     string public_endpoint_domain_name = 2
         [(google.api.field_behavior) = OUTPUT_ONLY];
 
-    // Optional. Private service connect config.
-    // If
+    // Optional. Private service connect config. The private service connection
+    // is available only for Optimized storage type, not for embedding
+    // management now. If
     // [PrivateServiceConnectConfig.enable_private_service_connect][google.cloud.aiplatform.v1beta1.PrivateServiceConnectConfig.enable_private_service_connect]
     // set to true, customers will use private service connection to send
     // request. Otherwise, the connection will set to public endpoint.
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature_online_store_admin_service.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature_online_store_admin_service.proto
index 005ef7d40408..52d69615ca04 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature_online_store_admin_service.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/feature_online_store_admin_service.proto
@@ -196,7 +196,7 @@ service FeatureOnlineStoreAdminService {
 message CreateFeatureOnlineStoreRequest {
   // Required. The resource name of the Location to create FeatureOnlineStores.
   // Format:
-  // `projects/{project}/locations/{location}'`
+  // `projects/{project}/locations/{location}`
   string parent = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = {
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/llm_utility_service.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/llm_utility_service.proto
index 3fddf3acc845..164d991b669a 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/llm_utility_service.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/llm_utility_service.proto
@@ -20,6 +20,7 @@ import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
+import "google/cloud/aiplatform/v1beta1/prediction_service.proto";
 import "google/protobuf/struct.proto";
 
 option csharp_namespace = "Google.Cloud.AIPlatform.V1Beta1";
@@ -36,6 +37,19 @@ service LlmUtilityService {
   option (google.api.oauth_scopes) =
       "https://www.googleapis.com/auth/cloud-platform";
 
+  // Perform a token counting.
+  rpc CountTokens(CountTokensRequest) returns (CountTokensResponse) {
+    option (google.api.http) = {
+      post: "/v1beta1/{endpoint=projects/*/locations/*/endpoints/*}:countTokens"
+      body: "*"
+      additional_bindings {
+        post: "/v1beta1/{endpoint=projects/*/locations/*/publishers/*/models/*}:countTokens"
+        body: "*"
+      }
+    };
+    option (google.api.method_signature) = "endpoint,instances";
+  }
+
   // Return a list of tokens based on the input text.
   rpc ComputeTokens(ComputeTokensRequest) returns (ComputeTokensResponse) {
     option (google.api.http) = {
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/model_evaluation.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/model_evaluation.proto
index ff84a437e343..065e444478fa 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/model_evaluation.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/model_evaluation.proto
@@ -125,7 +125,7 @@ message ModelEvaluation {
   // The metadata of the ModelEvaluation.
   // For the ModelEvaluation uploaded from Managed Pipeline, metadata contains a
   // structured value with keys of "pipeline_job_id", "evaluation_dataset_type",
-  // "evaluation_dataset_path".
+  // "evaluation_dataset_path", "row_based_metrics_path".
   google.protobuf.Value metadata = 11;
 
   // Specify the configuration for bias detection.
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/persistent_resource.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/persistent_resource.proto
index fd6e19fb1857..abf5e2c85b94 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/persistent_resource.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/persistent_resource.proto
@@ -50,14 +50,14 @@ message PersistentResource {
     // created.
     PROVISIONING = 1;
 
-    // The RUNNING state indicates the persistent resources is healthy and fully
+    // The RUNNING state indicates the persistent resource is healthy and fully
     // usable.
     RUNNING = 3;
 
-    // The STOPPING state indicates the persistent resources is being deleted.
+    // The STOPPING state indicates the persistent resource is being deleted.
     STOPPING = 4;
 
-    // The ERROR state indicates the persistent resources may be unusable.
+    // The ERROR state indicates the persistent resource may be unusable.
     // Details can be found in the `error` field.
     ERROR = 5;
   }
diff --git a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/tensorboard_service.proto b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/tensorboard_service.proto
index 5f1943ba37d9..30352d7546de 100644
--- a/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/tensorboard_service.proto
+++ b/java-aiplatform/proto-google-cloud-aiplatform-v1beta1/src/main/proto/google/cloud/aiplatform/v1beta1/tensorboard_service.proto
@@ -237,7 +237,7 @@ service TensorboardService {
   rpc BatchCreateTensorboardTimeSeries(BatchCreateTensorboardTimeSeriesRequest)
       returns (BatchCreateTensorboardTimeSeriesResponse) {
     option (google.api.http) = {
-      post: "/v1beta1/{parent=projects/*/locations/*/tensorboards/*/experiments/*}/runs/*/timeSeries:batchCreate"
+      post: "/v1beta1/{parent=projects/*/locations/*/tensorboards/*/experiments/*}:batchCreate"
       body: "*"
     };
     option (google.api.method_signature) = "parent,requests";
@@ -304,7 +304,7 @@ service TensorboardService {
       BatchReadTensorboardTimeSeriesDataRequest)
       returns (BatchReadTensorboardTimeSeriesDataResponse) {
     option (google.api.http) = {
-      get: "/v1beta1/{tensorboard=projects/*/locations/*/tensorboards/*}/experiments/*/runs/*/timeSeries:batchRead"
+      get: "/v1beta1/{tensorboard=projects/*/locations/*/tensorboards/*}:batchRead"
     };
     option (google.api.method_signature) = "tensorboard";
   }
diff --git a/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/AsyncCountTokens.java b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/AsyncCountTokens.java
new file mode 100644
index 000000000000..70a99f3210d3
--- /dev/null
+++ b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/AsyncCountTokens.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.aiplatform.v1beta1.samples;
+
+// [START aiplatform_v1beta1_generated_LlmUtilityService_CountTokens_async]
+import com.google.api.core.ApiFuture;
+import com.google.cloud.aiplatform.v1beta1.Content;
+import com.google.cloud.aiplatform.v1beta1.CountTokensRequest;
+import com.google.cloud.aiplatform.v1beta1.CountTokensResponse;
+import com.google.cloud.aiplatform.v1beta1.EndpointName;
+import com.google.cloud.aiplatform.v1beta1.LlmUtilityServiceClient;
+import com.google.protobuf.Value;
+import java.util.ArrayList;
+
+public class AsyncCountTokens {
+
+  public static void main(String[] args) throws Exception {
+    asyncCountTokens();
+  }
+
+  public static void asyncCountTokens() throws Exception {
+    // This snippet has been automatically generated and should be regarded as a code template only.
+    // It will require modifications to work:
+    // - It may require correct/in-range values for request initialization.
+    // - It may require specifying regional endpoints when creating the service client as shown in
+    // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+    try (LlmUtilityServiceClient llmUtilityServiceClient = LlmUtilityServiceClient.create()) {
+      CountTokensRequest request =
+          CountTokensRequest.newBuilder()
+              .setEndpoint(
+                  EndpointName.ofProjectLocationEndpointName(
+                          "[PROJECT]", "[LOCATION]", "[ENDPOINT]")
+                      .toString())
+              .setModel("model104069929")
+              .addAllInstances(new ArrayList<Value>())
+              .addAllContents(new ArrayList<Content>())
+              .build();
+      ApiFuture<CountTokensResponse> future =
+          llmUtilityServiceClient.countTokensCallable().futureCall(request);
+      // Do something.
+      CountTokensResponse response = future.get();
+    }
+  }
+}
+// [END aiplatform_v1beta1_generated_LlmUtilityService_CountTokens_async]
diff --git a/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokens.java b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokens.java
new file mode 100644
index 000000000000..f8aeb3cac56f
--- /dev/null
+++ b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokens.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.aiplatform.v1beta1.samples;
+
+// [START aiplatform_v1beta1_generated_LlmUtilityService_CountTokens_sync]
+import com.google.cloud.aiplatform.v1beta1.Content;
+import com.google.cloud.aiplatform.v1beta1.CountTokensRequest;
+import com.google.cloud.aiplatform.v1beta1.CountTokensResponse;
+import com.google.cloud.aiplatform.v1beta1.EndpointName;
+import com.google.cloud.aiplatform.v1beta1.LlmUtilityServiceClient;
+import com.google.protobuf.Value;
+import java.util.ArrayList;
+
+public class SyncCountTokens {
+
+  public static void main(String[] args) throws Exception {
+    syncCountTokens();
+  }
+
+  public static void syncCountTokens() throws Exception {
+    // This snippet has been automatically generated and should be regarded as a code template only.
+    // It will require modifications to work:
+    // - It may require correct/in-range values for request initialization.
+    // - It may require specifying regional endpoints when creating the service client as shown in
+    // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+    try (LlmUtilityServiceClient llmUtilityServiceClient = LlmUtilityServiceClient.create()) {
+      CountTokensRequest request =
+          CountTokensRequest.newBuilder()
+              .setEndpoint(
+                  EndpointName.ofProjectLocationEndpointName(
+                          "[PROJECT]", "[LOCATION]", "[ENDPOINT]")
+                      .toString())
+              .setModel("model104069929")
+              .addAllInstances(new ArrayList<Value>())
+              .addAllContents(new ArrayList<Content>())
+              .build();
+      CountTokensResponse response = llmUtilityServiceClient.countTokens(request);
+    }
+  }
+}
+// [END aiplatform_v1beta1_generated_LlmUtilityService_CountTokens_sync]
diff --git a/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokensEndpointnameListvalue.java b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokensEndpointnameListvalue.java
new file mode 100644
index 000000000000..5d78054042bf
--- /dev/null
+++ b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokensEndpointnameListvalue.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.aiplatform.v1beta1.samples;
+
+// [START aiplatform_v1beta1_generated_LlmUtilityService_CountTokens_EndpointnameListvalue_sync]
+import com.google.cloud.aiplatform.v1beta1.CountTokensResponse;
+import com.google.cloud.aiplatform.v1beta1.EndpointName;
+import com.google.cloud.aiplatform.v1beta1.LlmUtilityServiceClient;
+import com.google.protobuf.Value;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SyncCountTokensEndpointnameListvalue {
+
+  public static void main(String[] args) throws Exception {
+    syncCountTokensEndpointnameListvalue();
+  }
+
+  public static void syncCountTokensEndpointnameListvalue() throws Exception {
+    // This snippet has been automatically generated and should be regarded as a code template only.
+    // It will require modifications to work:
+    // - It may require correct/in-range values for request initialization.
+    // - It may require specifying regional endpoints when creating the service client as shown in
+    // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+    try (LlmUtilityServiceClient llmUtilityServiceClient = LlmUtilityServiceClient.create()) {
+      EndpointName endpoint =
+          EndpointName.ofProjectLocationEndpointName("[PROJECT]", "[LOCATION]", "[ENDPOINT]");
+      List<Value> instances = new ArrayList<>();
+      CountTokensResponse response = llmUtilityServiceClient.countTokens(endpoint, instances);
+    }
+  }
+}
+// [END aiplatform_v1beta1_generated_LlmUtilityService_CountTokens_EndpointnameListvalue_sync]
diff --git a/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokensStringListvalue.java b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokensStringListvalue.java
new file mode 100644
index 000000000000..0191eae18656
--- /dev/null
+++ b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservice/counttokens/SyncCountTokensStringListvalue.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.google.cloud.aiplatform.v1beta1.samples;
+
+// [START aiplatform_v1beta1_generated_LlmUtilityService_CountTokens_StringListvalue_sync]
+import com.google.cloud.aiplatform.v1beta1.CountTokensResponse;
+import com.google.cloud.aiplatform.v1beta1.EndpointName;
+import com.google.cloud.aiplatform.v1beta1.LlmUtilityServiceClient;
+import com.google.protobuf.Value;
+import java.util.ArrayList;
+import java.util.List;
+
+public class SyncCountTokensStringListvalue {
+
+  public static void main(String[] args) throws Exception {
+    syncCountTokensStringListvalue();
+  }
+
+  public static void syncCountTokensStringListvalue() throws Exception {
+    // This snippet has been automatically generated and should be regarded as a code template only.
+    // It will require modifications to work:
+    // - It may require correct/in-range values for request initialization.
+    // - It may require specifying regional endpoints when creating the service client as shown in
+    // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
+    try (LlmUtilityServiceClient llmUtilityServiceClient = LlmUtilityServiceClient.create()) {
+      String endpoint =
+          EndpointName.ofProjectLocationEndpointName("[PROJECT]", "[LOCATION]", "[ENDPOINT]")
+              .toString();
+      List<Value> instances = new ArrayList<>();
+      CountTokensResponse response = llmUtilityServiceClient.countTokens(endpoint, instances);
+    }
+  }
+}
+// [END aiplatform_v1beta1_generated_LlmUtilityService_CountTokens_StringListvalue_sync]
diff --git a/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservicesettings/computetokens/SyncComputeTokens.java b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservicesettings/counttokens/SyncCountTokens.java
similarity index 88%
rename from java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservicesettings/computetokens/SyncComputeTokens.java
rename to java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservicesettings/counttokens/SyncCountTokens.java
index da9abf90221f..19d46636c9d9 100644
--- a/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservicesettings/computetokens/SyncComputeTokens.java
+++ b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/llmutilityservicesettings/counttokens/SyncCountTokens.java
@@ -16,17 +16,17 @@
 
 package com.google.cloud.aiplatform.v1beta1.samples;
 
-// [START aiplatform_v1beta1_generated_LlmUtilityServiceSettings_ComputeTokens_sync]
+// [START aiplatform_v1beta1_generated_LlmUtilityServiceSettings_CountTokens_sync]
 import com.google.cloud.aiplatform.v1beta1.LlmUtilityServiceSettings;
 import java.time.Duration;
 
-public class SyncComputeTokens {
+public class SyncCountTokens {
 
   public static void main(String[] args) throws Exception {
-    syncComputeTokens();
+    syncCountTokens();
   }
 
-  public static void syncComputeTokens() throws Exception {
+  public static void syncCountTokens() throws Exception {
     // This snippet has been automatically generated and should be regarded as a code template only.
     // It will require modifications to work:
     // - It may require correct/in-range values for request initialization.
@@ -35,10 +35,10 @@ public static void syncComputeTokens() throws Exception {
     LlmUtilityServiceSettings.Builder llmUtilityServiceSettingsBuilder =
         LlmUtilityServiceSettings.newBuilder();
     llmUtilityServiceSettingsBuilder
-        .computeTokensSettings()
+        .countTokensSettings()
         .setRetrySettings(
             llmUtilityServiceSettingsBuilder
-                .computeTokensSettings()
+                .countTokensSettings()
                 .getRetrySettings()
                 .toBuilder()
                 .setTotalTimeout(Duration.ofSeconds(30))
@@ -46,4 +46,4 @@ public static void syncComputeTokens() throws Exception {
     LlmUtilityServiceSettings llmUtilityServiceSettings = llmUtilityServiceSettingsBuilder.build();
   }
 }
-// [END aiplatform_v1beta1_generated_LlmUtilityServiceSettings_ComputeTokens_sync]
+// [END aiplatform_v1beta1_generated_LlmUtilityServiceSettings_CountTokens_sync]
diff --git a/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/stub/llmutilityservicestubsettings/computetokens/SyncComputeTokens.java b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/stub/llmutilityservicestubsettings/counttokens/SyncCountTokens.java
similarity index 88%
rename from java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/stub/llmutilityservicestubsettings/computetokens/SyncComputeTokens.java
rename to java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/stub/llmutilityservicestubsettings/counttokens/SyncCountTokens.java
index 3e636da3fe56..a393c621bcd8 100644
--- a/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/stub/llmutilityservicestubsettings/computetokens/SyncComputeTokens.java
+++ b/java-aiplatform/samples/snippets/generated/com/google/cloud/aiplatform/v1beta1/stub/llmutilityservicestubsettings/counttokens/SyncCountTokens.java
@@ -16,17 +16,17 @@
 
 package com.google.cloud.aiplatform.v1beta1.stub.samples;
 
-// [START aiplatform_v1beta1_generated_LlmUtilityServiceStubSettings_ComputeTokens_sync]
+// [START aiplatform_v1beta1_generated_LlmUtilityServiceStubSettings_CountTokens_sync]
 import com.google.cloud.aiplatform.v1beta1.stub.LlmUtilityServiceStubSettings;
 import java.time.Duration;
 
-public class SyncComputeTokens {
+public class SyncCountTokens {
 
   public static void main(String[] args) throws Exception {
-    syncComputeTokens();
+    syncCountTokens();
   }
 
-  public static void syncComputeTokens() throws Exception {
+  public static void syncCountTokens() throws Exception {
     // This snippet has been automatically generated and should be regarded as a code template only.
     // It will require modifications to work:
     // - It may require correct/in-range values for request initialization.
@@ -35,10 +35,10 @@ public static void syncComputeTokens() throws Exception {
     LlmUtilityServiceStubSettings.Builder llmUtilityServiceSettingsBuilder =
         LlmUtilityServiceStubSettings.newBuilder();
     llmUtilityServiceSettingsBuilder
-        .computeTokensSettings()
+        .countTokensSettings()
         .setRetrySettings(
             llmUtilityServiceSettingsBuilder
-                .computeTokensSettings()
+                .countTokensSettings()
                 .getRetrySettings()
                 .toBuilder()
                 .setTotalTimeout(Duration.ofSeconds(30))
@@ -47,4 +47,4 @@ public static void syncComputeTokens() throws Exception {
         llmUtilityServiceSettingsBuilder.build();
   }
 }
-// [END aiplatform_v1beta1_generated_LlmUtilityServiceStubSettings_ComputeTokens_sync]
+// [END aiplatform_v1beta1_generated_LlmUtilityServiceStubSettings_CountTokens_sync]