From 3c5cf862dc440fd85c775696d2ac228473c957d6 Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Wed, 1 Sep 2021 01:33:11 -0700
Subject: [PATCH 1/2] docs: Keep the API doc up-to-date

PiperOrigin-RevId: 391605108

Source-Author: Google APIs <noreply@google.com>
Source-Date: Wed Aug 18 14:03:21 2021 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 62d50355dff115d1b566a77bbcd6ae087fb470c0
Source-Link: https://github.com/googleapis/googleapis/commit/62d50355dff115d1b566a77bbcd6ae087fb470c0
---
 .../cloud/retail/v2/CatalogServiceClient.java |   48 +-
 .../retail/v2/CompletionServiceClient.java    |   36 +-
 .../cloud/retail/v2/ProductServiceClient.java |   84 +-
 .../cloud/retail/v2/SearchServiceClient.java  |   24 +-
 .../google/cloud/retail/v2/package-info.java  |   12 +-
 .../cloud/retail/v2/CatalogServiceGrpc.java   |   32 +-
 .../retail/v2/CompletionServiceGrpc.java      |   52 +-
 .../cloud/retail/v2/ProductServiceGrpc.java   |   48 +-
 .../cloud/retail/v2/SearchServiceGrpc.java    |   36 +-
 .../cloud/retail/v2/CompleteQueryRequest.java |   52 +-
 .../v2/CompleteQueryRequestOrBuilder.java     |   14 +-
 .../retail/v2/CompleteQueryResponse.java      |  138 +-
 .../v2/CompleteQueryResponseOrBuilder.java    |   30 +-
 .../retail/v2/CompletionDataInputConfig.java  |   24 +-
 .../CompletionDataInputConfigOrBuilder.java   |    6 +-
 .../retail/v2/ImportProductsRequest.java      |   12 +-
 .../com/google/cloud/retail/v2/Product.java   |  152 +-
 .../google/cloud/retail/v2/ProductDetail.java |  156 +-
 .../retail/v2/ProductDetailOrBuilder.java     |   39 +-
 .../cloud/retail/v2/ProductOrBuilder.java     |   53 +-
 .../google/cloud/retail/v2/SearchRequest.java | 1717 ++++++++++-------
 .../retail/v2/SearchRequestOrBuilder.java     |  291 ++-
 .../cloud/retail/v2/SearchResponse.java       |  225 ++-
 .../cloud/retail/v2/SearchServiceProto.java   |   95 +-
 .../google/cloud/retail/v2/catalog.proto      |    2 +-
 .../cloud/retail/v2/catalog_service.proto     |   10 +-
 .../proto/google/cloud/retail/v2/common.proto |    2 +-
 .../cloud/retail/v2/completion_service.proto  |   30 +-
 .../cloud/retail/v2/import_config.proto       |   10 +-
 .../cloud/retail/v2/prediction_service.proto  |    2 +-
 .../google/cloud/retail/v2/product.proto      |   16 +-
 .../cloud/retail/v2/product_service.proto     |   14 +-
 .../google/cloud/retail/v2/purge_config.proto |    2 +-
 .../cloud/retail/v2/search_service.proto      |  176 +-
 .../google/cloud/retail/v2/user_event.proto   |   20 +-
 .../cloud/retail/v2/user_event_service.proto  |    2 +-
 synth.metadata                                |    6 +-
 37 files changed, 2175 insertions(+), 1493 deletions(-)

diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/CatalogServiceClient.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/CatalogServiceClient.java
index e0f21db3..fc359221 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/CatalogServiceClient.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/CatalogServiceClient.java
@@ -403,9 +403,9 @@ public final UnaryCallable<UpdateCatalogRequest, Catalog> updateCatalogCallable(
    *   <li>UserEventService will only join events with products from branch {newBranch}.
    * </ul>
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -461,9 +461,9 @@ public final void setDefaultBranch(CatalogName catalog) {
    *   <li>UserEventService will only join events with products from branch {newBranch}.
    * </ul>
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -517,9 +517,9 @@ public final void setDefaultBranch(String catalog) {
    *   <li>UserEventService will only join events with products from branch {newBranch}.
    * </ul>
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -576,9 +576,9 @@ public final void setDefaultBranch(SetDefaultBranchRequest request) {
    *   <li>UserEventService will only join events with products from branch {newBranch}.
    * </ul>
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -607,9 +607,9 @@ public final UnaryCallable<SetDefaultBranchRequest, Empty> setDefaultBranchCalla
    * [CatalogService.SetDefaultBranch][google.cloud.retail.v2.CatalogService.SetDefaultBranch]
    * method under a specified parent catalog.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -638,9 +638,9 @@ public final GetDefaultBranchResponse getDefaultBranch(CatalogName catalog) {
    * [CatalogService.SetDefaultBranch][google.cloud.retail.v2.CatalogService.SetDefaultBranch]
    * method under a specified parent catalog.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -667,9 +667,9 @@ public final GetDefaultBranchResponse getDefaultBranch(String catalog) {
    * [CatalogService.SetDefaultBranch][google.cloud.retail.v2.CatalogService.SetDefaultBranch]
    * method under a specified parent catalog.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -696,9 +696,9 @@ public final GetDefaultBranchResponse getDefaultBranch(GetDefaultBranchRequest r
    * [CatalogService.SetDefaultBranch][google.cloud.retail.v2.CatalogService.SetDefaultBranch]
    * method under a specified parent catalog.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/CompletionServiceClient.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/CompletionServiceClient.java
index dc9ba687..2844d0ee 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/CompletionServiceClient.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/CompletionServiceClient.java
@@ -33,9 +33,9 @@
 /**
  * Service Description: Auto-completion service for retail.
  *
- * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
- * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
- * Search.
+ * <p>This feature is only available for users who have Retail Search enabled. Please submit a form
+ * [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in using
+ * Retail Search.
  *
  * <p>This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
@@ -173,9 +173,9 @@ public final OperationsClient getOperationsClient() {
   /**
    * Completes the specified prefix with keyword suggestions.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -206,9 +206,9 @@ public final CompleteQueryResponse completeQuery(CompleteQueryRequest request) {
   /**
    * Completes the specified prefix with keyword suggestions.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -241,9 +241,9 @@ public final UnaryCallable<CompleteQueryRequest, CompleteQueryResponse> complete
    *
    * <p>Request processing may be synchronous. Partial updating is not supported.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -274,9 +274,9 @@ public final UnaryCallable<CompleteQueryRequest, CompleteQueryResponse> complete
    *
    * <p>Request processing may be synchronous. Partial updating is not supported.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -307,9 +307,9 @@ public final UnaryCallable<CompleteQueryRequest, CompleteQueryResponse> complete
    *
    * <p>Request processing may be synchronous. Partial updating is not supported.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/ProductServiceClient.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/ProductServiceClient.java
index 2358c680..57b9a6d8 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/ProductServiceClient.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/ProductServiceClient.java
@@ -911,9 +911,9 @@ public final UnaryCallable<ImportProductsRequest, Operation> importProductsCalla
    * [AddFulfillmentPlaces][google.cloud.retail.v2.ProductService.AddFulfillmentPlaces], and
    * [RemoveFulfillmentPlaces][google.cloud.retail.v2.ProductService.RemoveFulfillmentPlaces].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1005,9 +1005,9 @@ public final OperationFuture<SetInventoryResponse, SetInventoryMetadata> setInve
    * [AddFulfillmentPlaces][google.cloud.retail.v2.ProductService.AddFulfillmentPlaces], and
    * [RemoveFulfillmentPlaces][google.cloud.retail.v2.ProductService.RemoveFulfillmentPlaces].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1066,9 +1066,9 @@ public final OperationFuture<SetInventoryResponse, SetInventoryMetadata> setInve
    * [AddFulfillmentPlaces][google.cloud.retail.v2.ProductService.AddFulfillmentPlaces], and
    * [RemoveFulfillmentPlaces][google.cloud.retail.v2.ProductService.RemoveFulfillmentPlaces].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1127,9 +1127,9 @@ public final OperationFuture<SetInventoryResponse, SetInventoryMetadata> setInve
    * [AddFulfillmentPlaces][google.cloud.retail.v2.ProductService.AddFulfillmentPlaces], and
    * [RemoveFulfillmentPlaces][google.cloud.retail.v2.ProductService.RemoveFulfillmentPlaces].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1165,9 +1165,9 @@ public final UnaryCallable<SetInventoryRequest, Operation> setInventoryCallable(
    * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
    * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1210,9 +1210,9 @@ public final UnaryCallable<SetInventoryRequest, Operation> setInventoryCallable(
    * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
    * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1254,9 +1254,9 @@ public final UnaryCallable<SetInventoryRequest, Operation> setInventoryCallable(
    * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
    * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1298,9 +1298,9 @@ public final UnaryCallable<SetInventoryRequest, Operation> setInventoryCallable(
    * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
    * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1342,9 +1342,9 @@ public final UnaryCallable<SetInventoryRequest, Operation> setInventoryCallable(
    * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
    * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1385,9 +1385,9 @@ public final UnaryCallable<SetInventoryRequest, Operation> setInventoryCallable(
    * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
    * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1430,9 +1430,9 @@ public final UnaryCallable<SetInventoryRequest, Operation> setInventoryCallable(
    * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
    * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1474,9 +1474,9 @@ public final UnaryCallable<SetInventoryRequest, Operation> setInventoryCallable(
    * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
    * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1518,9 +1518,9 @@ public final UnaryCallable<SetInventoryRequest, Operation> setInventoryCallable(
    * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
    * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -1564,9 +1564,9 @@ public final UnaryCallable<SetInventoryRequest, Operation> setInventoryCallable(
    * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
    * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/SearchServiceClient.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/SearchServiceClient.java
index 31769129..cda1f5fa 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/SearchServiceClient.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/SearchServiceClient.java
@@ -37,9 +37,9 @@
 /**
  * Service Description: Service for search.
  *
- * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
- * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
- * Search.
+ * <p>This feature is only available for users who have Retail Search enabled. Please submit a form
+ * [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in using
+ * Retail Search.
  *
  * <p>This class provides the ability to make remote calls to the backing service through method
  * calls that map to API methods. Sample code to get started:
@@ -176,9 +176,9 @@ public SearchServiceStub getStub() {
   /**
    * Performs a search.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -222,9 +222,9 @@ public final SearchPagedResponse search(SearchRequest request) {
   /**
    * Performs a search.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
@@ -268,9 +268,9 @@ public final UnaryCallable<SearchRequest, SearchPagedResponse> searchPagedCallab
   /**
    * Performs a search.
    *
-   * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
-   * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
-   * Search.
+   * <p>This feature is only available for users who have Retail Search enabled. Please submit a
+   * form [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in
+   * using Retail Search.
    *
    * <p>Sample code:
    *
diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/package-info.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/package-info.java
index 10ff0bb1..44780b0e 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/package-info.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/package-info.java
@@ -35,9 +35,9 @@
  *
  * <p>Service Description: Auto-completion service for retail.
  *
- * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
- * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
- * Search.
+ * <p>This feature is only available for users who have Retail Search enabled. Please submit a form
+ * [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in using
+ * Retail Search.
  *
  * <p>Sample for CompletionServiceClient:
  *
@@ -100,9 +100,9 @@
  *
  * <p>Service Description: Service for search.
  *
- * <p>This feature is only available for users who have Retail Search enabled. Contact Retail
- * Support (retail-search-support{@literal @}google.com) if you are interested in using Retail
- * Search.
+ * <p>This feature is only available for users who have Retail Search enabled. Please submit a form
+ * [here](https://cloud.google.com/contact) to contact cloud sales if you are interested in using
+ * Retail Search.
  *
  * <p>Sample for SearchServiceClient:
  *
diff --git a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CatalogServiceGrpc.java b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CatalogServiceGrpc.java
index cdcf37d2..d5d52b5a 100644
--- a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CatalogServiceGrpc.java
+++ b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CatalogServiceGrpc.java
@@ -324,8 +324,8 @@ public void updateCatalog(
      * * UserEventService will only join events with products from branch
      *   {newBranch}.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void setDefaultBranch(
@@ -343,8 +343,8 @@ public void setDefaultBranch(
      * [CatalogService.SetDefaultBranch][google.cloud.retail.v2.CatalogService.SetDefaultBranch]
      * method under a specified parent catalog.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void getDefaultBranch(
@@ -473,8 +473,8 @@ public void updateCatalog(
      * * UserEventService will only join events with products from branch
      *   {newBranch}.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void setDefaultBranch(
@@ -494,8 +494,8 @@ public void setDefaultBranch(
      * [CatalogService.SetDefaultBranch][google.cloud.retail.v2.CatalogService.SetDefaultBranch]
      * method under a specified parent catalog.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void getDefaultBranch(
@@ -588,8 +588,8 @@ public com.google.cloud.retail.v2.Catalog updateCatalog(
      * * UserEventService will only join events with products from branch
      *   {newBranch}.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.protobuf.Empty setDefaultBranch(
@@ -606,8 +606,8 @@ public com.google.protobuf.Empty setDefaultBranch(
      * [CatalogService.SetDefaultBranch][google.cloud.retail.v2.CatalogService.SetDefaultBranch]
      * method under a specified parent catalog.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.cloud.retail.v2.GetDefaultBranchResponse getDefaultBranch(
@@ -697,8 +697,8 @@ protected CatalogServiceFutureStub build(
      * * UserEventService will only join events with products from branch
      *   {newBranch}.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.protobuf.Empty>
@@ -715,8 +715,8 @@ protected CatalogServiceFutureStub build(
      * [CatalogService.SetDefaultBranch][google.cloud.retail.v2.CatalogService.SetDefaultBranch]
      * method under a specified parent catalog.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<
diff --git a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionServiceGrpc.java b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionServiceGrpc.java
index c328621e..d1df5027 100644
--- a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionServiceGrpc.java
+++ b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionServiceGrpc.java
@@ -23,8 +23,8 @@
  * <pre>
  * Auto-completion service for retail.
  * This feature is only available for users who have Retail Search enabled.
- * Contact Retail Support (retail-search-support&#64;google.com) if you are
- * interested in using Retail Search.
+ * Please submit a form [here](https://cloud.google.com/contact) to contact
+ * cloud sales if you are interested in using Retail Search.
  * </pre>
  */
 @javax.annotation.Generated(
@@ -177,8 +177,8 @@ public CompletionServiceFutureStub newStub(
    * <pre>
    * Auto-completion service for retail.
    * This feature is only available for users who have Retail Search enabled.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in using Retail Search.
+   * Please submit a form [here](https://cloud.google.com/contact) to contact
+   * cloud sales if you are interested in using Retail Search.
    * </pre>
    */
   public abstract static class CompletionServiceImplBase implements io.grpc.BindableService {
@@ -189,8 +189,8 @@ public abstract static class CompletionServiceImplBase implements io.grpc.Bindab
      * <pre>
      * Completes the specified prefix with keyword suggestions.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void completeQuery(
@@ -208,8 +208,8 @@ public void completeQuery(
      * Bulk import of processed completion dataset.
      * Request processing may be synchronous. Partial updating is not supported.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void importCompletionData(
@@ -245,8 +245,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
    * <pre>
    * Auto-completion service for retail.
    * This feature is only available for users who have Retail Search enabled.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in using Retail Search.
+   * Please submit a form [here](https://cloud.google.com/contact) to contact
+   * cloud sales if you are interested in using Retail Search.
    * </pre>
    */
   public static final class CompletionServiceStub
@@ -267,8 +267,8 @@ protected CompletionServiceStub build(
      * <pre>
      * Completes the specified prefix with keyword suggestions.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void completeQuery(
@@ -288,8 +288,8 @@ public void completeQuery(
      * Bulk import of processed completion dataset.
      * Request processing may be synchronous. Partial updating is not supported.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void importCompletionData(
@@ -308,8 +308,8 @@ public void importCompletionData(
    * <pre>
    * Auto-completion service for retail.
    * This feature is only available for users who have Retail Search enabled.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in using Retail Search.
+   * Please submit a form [here](https://cloud.google.com/contact) to contact
+   * cloud sales if you are interested in using Retail Search.
    * </pre>
    */
   public static final class CompletionServiceBlockingStub
@@ -331,8 +331,8 @@ protected CompletionServiceBlockingStub build(
      * <pre>
      * Completes the specified prefix with keyword suggestions.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.cloud.retail.v2.CompleteQueryResponse completeQuery(
@@ -348,8 +348,8 @@ public com.google.cloud.retail.v2.CompleteQueryResponse completeQuery(
      * Bulk import of processed completion dataset.
      * Request processing may be synchronous. Partial updating is not supported.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.longrunning.Operation importCompletionData(
@@ -365,8 +365,8 @@ public com.google.longrunning.Operation importCompletionData(
    * <pre>
    * Auto-completion service for retail.
    * This feature is only available for users who have Retail Search enabled.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in using Retail Search.
+   * Please submit a form [here](https://cloud.google.com/contact) to contact
+   * cloud sales if you are interested in using Retail Search.
    * </pre>
    */
   public static final class CompletionServiceFutureStub
@@ -387,8 +387,8 @@ protected CompletionServiceFutureStub build(
      * <pre>
      * Completes the specified prefix with keyword suggestions.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<
@@ -405,8 +405,8 @@ protected CompletionServiceFutureStub build(
      * Bulk import of processed completion dataset.
      * Request processing may be synchronous. Partial updating is not supported.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
diff --git a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductServiceGrpc.java b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductServiceGrpc.java
index d13641d6..cc600650 100644
--- a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductServiceGrpc.java
+++ b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductServiceGrpc.java
@@ -602,8 +602,8 @@ public void importProducts(
      * and
      * [RemoveFulfillmentPlaces][google.cloud.retail.v2.ProductService.RemoveFulfillmentPlaces].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void setInventory(
@@ -628,8 +628,8 @@ public void setInventory(
      * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
      * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void addFulfillmentPlaces(
@@ -654,8 +654,8 @@ public void addFulfillmentPlaces(
      * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
      * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void removeFulfillmentPlaces(
@@ -881,8 +881,8 @@ public void importProducts(
      * and
      * [RemoveFulfillmentPlaces][google.cloud.retail.v2.ProductService.RemoveFulfillmentPlaces].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void setInventory(
@@ -909,8 +909,8 @@ public void setInventory(
      * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
      * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void addFulfillmentPlaces(
@@ -937,8 +937,8 @@ public void addFulfillmentPlaces(
      * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
      * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void removeFulfillmentPlaces(
@@ -1089,8 +1089,8 @@ public com.google.longrunning.Operation importProducts(
      * and
      * [RemoveFulfillmentPlaces][google.cloud.retail.v2.ProductService.RemoveFulfillmentPlaces].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.longrunning.Operation setInventory(
@@ -1114,8 +1114,8 @@ public com.google.longrunning.Operation setInventory(
      * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
      * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.longrunning.Operation addFulfillmentPlaces(
@@ -1139,8 +1139,8 @@ public com.google.longrunning.Operation addFulfillmentPlaces(
      * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
      * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.longrunning.Operation removeFulfillmentPlaces(
@@ -1289,8 +1289,8 @@ protected ProductServiceFutureStub build(
      * and
      * [RemoveFulfillmentPlaces][google.cloud.retail.v2.ProductService.RemoveFulfillmentPlaces].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
@@ -1314,8 +1314,8 @@ protected ProductServiceFutureStub build(
      * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
      * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
@@ -1339,8 +1339,8 @@ protected ProductServiceFutureStub build(
      * [GetProduct][google.cloud.retail.v2.ProductService.GetProduct] or
      * [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<com.google.longrunning.Operation>
diff --git a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchServiceGrpc.java b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchServiceGrpc.java
index dc941d6d..769c37ab 100644
--- a/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchServiceGrpc.java
+++ b/grpc-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchServiceGrpc.java
@@ -23,8 +23,8 @@
  * <pre>
  * Service for search.
  * This feature is only available for users who have Retail Search enabled.
- * Contact Retail Support (retail-search-support&#64;google.com) if you are
- * interested in using Retail Search.
+ * Please submit a form [here](https://cloud.google.com/contact) to contact
+ * cloud sales if you are interested in using Retail Search.
  * </pre>
  */
 @javax.annotation.Generated(
@@ -125,8 +125,8 @@ public SearchServiceFutureStub newStub(
    * <pre>
    * Service for search.
    * This feature is only available for users who have Retail Search enabled.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in using Retail Search.
+   * Please submit a form [here](https://cloud.google.com/contact) to contact
+   * cloud sales if you are interested in using Retail Search.
    * </pre>
    */
   public abstract static class SearchServiceImplBase implements io.grpc.BindableService {
@@ -137,8 +137,8 @@ public abstract static class SearchServiceImplBase implements io.grpc.BindableSe
      * <pre>
      * Performs a search.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void search(
@@ -166,8 +166,8 @@ public final io.grpc.ServerServiceDefinition bindService() {
    * <pre>
    * Service for search.
    * This feature is only available for users who have Retail Search enabled.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in using Retail Search.
+   * Please submit a form [here](https://cloud.google.com/contact) to contact
+   * cloud sales if you are interested in using Retail Search.
    * </pre>
    */
   public static final class SearchServiceStub
@@ -187,8 +187,8 @@ protected SearchServiceStub build(io.grpc.Channel channel, io.grpc.CallOptions c
      * <pre>
      * Performs a search.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public void search(
@@ -205,8 +205,8 @@ public void search(
    * <pre>
    * Service for search.
    * This feature is only available for users who have Retail Search enabled.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in using Retail Search.
+   * Please submit a form [here](https://cloud.google.com/contact) to contact
+   * cloud sales if you are interested in using Retail Search.
    * </pre>
    */
   public static final class SearchServiceBlockingStub
@@ -227,8 +227,8 @@ protected SearchServiceBlockingStub build(
      * <pre>
      * Performs a search.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.cloud.retail.v2.SearchResponse search(
@@ -244,8 +244,8 @@ public com.google.cloud.retail.v2.SearchResponse search(
    * <pre>
    * Service for search.
    * This feature is only available for users who have Retail Search enabled.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in using Retail Search.
+   * Please submit a form [here](https://cloud.google.com/contact) to contact
+   * cloud sales if you are interested in using Retail Search.
    * </pre>
    */
   public static final class SearchServiceFutureStub
@@ -266,8 +266,8 @@ protected SearchServiceFutureStub build(
      * <pre>
      * Performs a search.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      */
     public com.google.common.util.concurrent.ListenableFuture<
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryRequest.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryRequest.java
index dd7e053a..ead167f6 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryRequest.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryRequest.java
@@ -490,8 +490,8 @@ public com.google.protobuf.ByteString getDeviceTypeBytes() {
    * Current supported values:
    * * user-data
    * * cloud-retail
-   *   This option is not automatically enabled. Before using cloud-retail,
-   *   contact retail-search-support&#64;google.com first.
+   *   This option requires additional allowlisting. Before using cloud-retail,
+   *   contact Cloud Retail support team first.
    * </pre>
    *
    * <code>string dataset = 6;</code>
@@ -522,8 +522,8 @@ public java.lang.String getDataset() {
    * Current supported values:
    * * user-data
    * * cloud-retail
-   *   This option is not automatically enabled. Before using cloud-retail,
-   *   contact retail-search-support&#64;google.com first.
+   *   This option requires additional allowlisting. Before using cloud-retail,
+   *   contact Cloud Retail support team first.
    * </pre>
    *
    * <code>string dataset = 6;</code>
@@ -549,8 +549,10 @@ public com.google.protobuf.ByteString getDatasetBytes() {
    *
    *
    * <pre>
-   * Completion max suggestions.
-   * The maximum allowed max suggestions is 20. The default value is 20.
+   * Completion max suggestions. If left unset or set to 0, then will fallback
+   * to the configured value [CompletionConfig.max_suggestions][].
+   * The maximum allowed max suggestions is 20. If it is set higher, it will be
+   * capped by 20.
    * </pre>
    *
    * <code>int32 max_suggestions = 5;</code>
@@ -1734,8 +1736,8 @@ public Builder setDeviceTypeBytes(com.google.protobuf.ByteString value) {
      * Current supported values:
      * * user-data
      * * cloud-retail
-     *   This option is not automatically enabled. Before using cloud-retail,
-     *   contact retail-search-support&#64;google.com first.
+     *   This option requires additional allowlisting. Before using cloud-retail,
+     *   contact Cloud Retail support team first.
      * </pre>
      *
      * <code>string dataset = 6;</code>
@@ -1765,8 +1767,8 @@ public java.lang.String getDataset() {
      * Current supported values:
      * * user-data
      * * cloud-retail
-     *   This option is not automatically enabled. Before using cloud-retail,
-     *   contact retail-search-support&#64;google.com first.
+     *   This option requires additional allowlisting. Before using cloud-retail,
+     *   contact Cloud Retail support team first.
      * </pre>
      *
      * <code>string dataset = 6;</code>
@@ -1796,8 +1798,8 @@ public com.google.protobuf.ByteString getDatasetBytes() {
      * Current supported values:
      * * user-data
      * * cloud-retail
-     *   This option is not automatically enabled. Before using cloud-retail,
-     *   contact retail-search-support&#64;google.com first.
+     *   This option requires additional allowlisting. Before using cloud-retail,
+     *   contact Cloud Retail support team first.
      * </pre>
      *
      * <code>string dataset = 6;</code>
@@ -1826,8 +1828,8 @@ public Builder setDataset(java.lang.String value) {
      * Current supported values:
      * * user-data
      * * cloud-retail
-     *   This option is not automatically enabled. Before using cloud-retail,
-     *   contact retail-search-support&#64;google.com first.
+     *   This option requires additional allowlisting. Before using cloud-retail,
+     *   contact Cloud Retail support team first.
      * </pre>
      *
      * <code>string dataset = 6;</code>
@@ -1852,8 +1854,8 @@ public Builder clearDataset() {
      * Current supported values:
      * * user-data
      * * cloud-retail
-     *   This option is not automatically enabled. Before using cloud-retail,
-     *   contact retail-search-support&#64;google.com first.
+     *   This option requires additional allowlisting. Before using cloud-retail,
+     *   contact Cloud Retail support team first.
      * </pre>
      *
      * <code>string dataset = 6;</code>
@@ -1877,8 +1879,10 @@ public Builder setDatasetBytes(com.google.protobuf.ByteString value) {
      *
      *
      * <pre>
-     * Completion max suggestions.
-     * The maximum allowed max suggestions is 20. The default value is 20.
+     * Completion max suggestions. If left unset or set to 0, then will fallback
+     * to the configured value [CompletionConfig.max_suggestions][].
+     * The maximum allowed max suggestions is 20. If it is set higher, it will be
+     * capped by 20.
      * </pre>
      *
      * <code>int32 max_suggestions = 5;</code>
@@ -1893,8 +1897,10 @@ public int getMaxSuggestions() {
      *
      *
      * <pre>
-     * Completion max suggestions.
-     * The maximum allowed max suggestions is 20. The default value is 20.
+     * Completion max suggestions. If left unset or set to 0, then will fallback
+     * to the configured value [CompletionConfig.max_suggestions][].
+     * The maximum allowed max suggestions is 20. If it is set higher, it will be
+     * capped by 20.
      * </pre>
      *
      * <code>int32 max_suggestions = 5;</code>
@@ -1912,8 +1918,10 @@ public Builder setMaxSuggestions(int value) {
      *
      *
      * <pre>
-     * Completion max suggestions.
-     * The maximum allowed max suggestions is 20. The default value is 20.
+     * Completion max suggestions. If left unset or set to 0, then will fallback
+     * to the configured value [CompletionConfig.max_suggestions][].
+     * The maximum allowed max suggestions is 20. If it is set higher, it will be
+     * capped by 20.
      * </pre>
      *
      * <code>int32 max_suggestions = 5;</code>
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryRequestOrBuilder.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryRequestOrBuilder.java
index a40e5ed7..d2ad4899 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryRequestOrBuilder.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryRequestOrBuilder.java
@@ -242,8 +242,8 @@ public interface CompleteQueryRequestOrBuilder
    * Current supported values:
    * * user-data
    * * cloud-retail
-   *   This option is not automatically enabled. Before using cloud-retail,
-   *   contact retail-search-support&#64;google.com first.
+   *   This option requires additional allowlisting. Before using cloud-retail,
+   *   contact Cloud Retail support team first.
    * </pre>
    *
    * <code>string dataset = 6;</code>
@@ -263,8 +263,8 @@ public interface CompleteQueryRequestOrBuilder
    * Current supported values:
    * * user-data
    * * cloud-retail
-   *   This option is not automatically enabled. Before using cloud-retail,
-   *   contact retail-search-support&#64;google.com first.
+   *   This option requires additional allowlisting. Before using cloud-retail,
+   *   contact Cloud Retail support team first.
    * </pre>
    *
    * <code>string dataset = 6;</code>
@@ -277,8 +277,10 @@ public interface CompleteQueryRequestOrBuilder
    *
    *
    * <pre>
-   * Completion max suggestions.
-   * The maximum allowed max suggestions is 20. The default value is 20.
+   * Completion max suggestions. If left unset or set to 0, then will fallback
+   * to the configured value [CompletionConfig.max_suggestions][].
+   * The maximum allowed max suggestions is 20. If it is set higher, it will be
+   * capped by 20.
    * </pre>
    *
    * <code>int32 max_suggestions = 5;</code>
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryResponse.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryResponse.java
index 5a6d4656..16bc1949 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryResponse.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryResponse.java
@@ -2038,9 +2038,9 @@ public com.google.protobuf.ByteString getAttributionTokenBytes() {
    *
    *
    * <pre>
-   * Matched recent searches of this user. This field is a restricted feature.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in enabling it.
+   * Matched recent searches of this user. The maximum number of recent searches
+   * is 10. This field is a restricted feature. Contact Retail Search support
+   * team if you are interested in enabling it.
    * This feature is only available when
    * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
    * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -2068,9 +2068,9 @@ public com.google.protobuf.ByteString getAttributionTokenBytes() {
    *
    *
    * <pre>
-   * Matched recent searches of this user. This field is a restricted feature.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in enabling it.
+   * Matched recent searches of this user. The maximum number of recent searches
+   * is 10. This field is a restricted feature. Contact Retail Search support
+   * team if you are interested in enabling it.
    * This feature is only available when
    * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
    * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -2099,9 +2099,9 @@ public com.google.protobuf.ByteString getAttributionTokenBytes() {
    *
    *
    * <pre>
-   * Matched recent searches of this user. This field is a restricted feature.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in enabling it.
+   * Matched recent searches of this user. The maximum number of recent searches
+   * is 10. This field is a restricted feature. Contact Retail Search support
+   * team if you are interested in enabling it.
    * This feature is only available when
    * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
    * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -2128,9 +2128,9 @@ public int getRecentSearchResultsCount() {
    *
    *
    * <pre>
-   * Matched recent searches of this user. This field is a restricted feature.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in enabling it.
+   * Matched recent searches of this user. The maximum number of recent searches
+   * is 10. This field is a restricted feature. Contact Retail Search support
+   * team if you are interested in enabling it.
    * This feature is only available when
    * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
    * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -2158,9 +2158,9 @@ public com.google.cloud.retail.v2.CompleteQueryResponse.RecentSearchResult getRe
    *
    *
    * <pre>
-   * Matched recent searches of this user. This field is a restricted feature.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in enabling it.
+   * Matched recent searches of this user. The maximum number of recent searches
+   * is 10. This field is a restricted feature. Contact Retail Search support
+   * team if you are interested in enabling it.
    * This feature is only available when
    * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
    * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3189,9 +3189,9 @@ private void ensureRecentSearchResultsIsMutable() {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3222,9 +3222,9 @@ private void ensureRecentSearchResultsIsMutable() {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3254,9 +3254,9 @@ public int getRecentSearchResultsCount() {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3287,9 +3287,9 @@ public int getRecentSearchResultsCount() {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3326,9 +3326,9 @@ public Builder setRecentSearchResults(
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3364,9 +3364,9 @@ public Builder setRecentSearchResults(
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3403,9 +3403,9 @@ public Builder addRecentSearchResults(
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3442,9 +3442,9 @@ public Builder addRecentSearchResults(
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3479,9 +3479,9 @@ public Builder addRecentSearchResults(
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3517,9 +3517,9 @@ public Builder addRecentSearchResults(
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3555,9 +3555,9 @@ public Builder addAllRecentSearchResults(
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3590,9 +3590,9 @@ public Builder clearRecentSearchResults() {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3625,9 +3625,9 @@ public Builder removeRecentSearchResults(int index) {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3654,9 +3654,9 @@ public Builder removeRecentSearchResults(int index) {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3687,9 +3687,9 @@ public Builder removeRecentSearchResults(int index) {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3721,9 +3721,9 @@ public Builder removeRecentSearchResults(int index) {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3753,9 +3753,9 @@ public Builder removeRecentSearchResults(int index) {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -3786,9 +3786,9 @@ public Builder removeRecentSearchResults(int index) {
      *
      *
      * <pre>
-     * Matched recent searches of this user. This field is a restricted feature.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in enabling it.
+     * Matched recent searches of this user. The maximum number of recent searches
+     * is 10. This field is a restricted feature. Contact Retail Search support
+     * team if you are interested in enabling it.
      * This feature is only available when
      * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
      * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryResponseOrBuilder.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryResponseOrBuilder.java
index 31fc2c53..9a0704cc 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryResponseOrBuilder.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompleteQueryResponseOrBuilder.java
@@ -128,9 +128,9 @@ public interface CompleteQueryResponseOrBuilder
    *
    *
    * <pre>
-   * Matched recent searches of this user. This field is a restricted feature.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in enabling it.
+   * Matched recent searches of this user. The maximum number of recent searches
+   * is 10. This field is a restricted feature. Contact Retail Search support
+   * team if you are interested in enabling it.
    * This feature is only available when
    * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
    * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -155,9 +155,9 @@ public interface CompleteQueryResponseOrBuilder
    *
    *
    * <pre>
-   * Matched recent searches of this user. This field is a restricted feature.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in enabling it.
+   * Matched recent searches of this user. The maximum number of recent searches
+   * is 10. This field is a restricted feature. Contact Retail Search support
+   * team if you are interested in enabling it.
    * This feature is only available when
    * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
    * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -182,9 +182,9 @@ com.google.cloud.retail.v2.CompleteQueryResponse.RecentSearchResult getRecentSea
    *
    *
    * <pre>
-   * Matched recent searches of this user. This field is a restricted feature.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in enabling it.
+   * Matched recent searches of this user. The maximum number of recent searches
+   * is 10. This field is a restricted feature. Contact Retail Search support
+   * team if you are interested in enabling it.
    * This feature is only available when
    * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
    * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -208,9 +208,9 @@ com.google.cloud.retail.v2.CompleteQueryResponse.RecentSearchResult getRecentSea
    *
    *
    * <pre>
-   * Matched recent searches of this user. This field is a restricted feature.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in enabling it.
+   * Matched recent searches of this user. The maximum number of recent searches
+   * is 10. This field is a restricted feature. Contact Retail Search support
+   * team if you are interested in enabling it.
    * This feature is only available when
    * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
    * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
@@ -236,9 +236,9 @@ com.google.cloud.retail.v2.CompleteQueryResponse.RecentSearchResult getRecentSea
    *
    *
    * <pre>
-   * Matched recent searches of this user. This field is a restricted feature.
-   * Contact Retail Support (retail-search-support&#64;google.com) if you are
-   * interested in enabling it.
+   * Matched recent searches of this user. The maximum number of recent searches
+   * is 10. This field is a restricted feature. Contact Retail Search support
+   * team if you are interested in enabling it.
    * This feature is only available when
    * [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
    * field is set and [UserEvent][google.cloud.retail.v2.UserEvent] is imported.
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionDataInputConfig.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionDataInputConfig.java
index f051064f..6b8c403a 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionDataInputConfig.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionDataInputConfig.java
@@ -168,7 +168,7 @@ public SourceCase getSourceCase() {
    *
    * <pre>
    * Required. BigQuery input source.
-   * Add the IAM permission “BigQuery Data Viewer” for
+   * Add the IAM permission "BigQuery Data Viewer" for
    * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
    * using this feature otherwise an error is thrown.
    * </pre>
@@ -188,7 +188,7 @@ public boolean hasBigQuerySource() {
    *
    * <pre>
    * Required. BigQuery input source.
-   * Add the IAM permission “BigQuery Data Viewer” for
+   * Add the IAM permission "BigQuery Data Viewer" for
    * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
    * using this feature otherwise an error is thrown.
    * </pre>
@@ -211,7 +211,7 @@ public com.google.cloud.retail.v2.BigQuerySource getBigQuerySource() {
    *
    * <pre>
    * Required. BigQuery input source.
-   * Add the IAM permission “BigQuery Data Viewer” for
+   * Add the IAM permission "BigQuery Data Viewer" for
    * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
    * using this feature otherwise an error is thrown.
    * </pre>
@@ -599,7 +599,7 @@ public Builder clearSource() {
      *
      * <pre>
      * Required. BigQuery input source.
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * </pre>
@@ -619,7 +619,7 @@ public boolean hasBigQuerySource() {
      *
      * <pre>
      * Required. BigQuery input source.
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * </pre>
@@ -649,7 +649,7 @@ public com.google.cloud.retail.v2.BigQuerySource getBigQuerySource() {
      *
      * <pre>
      * Required. BigQuery input source.
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * </pre>
@@ -676,7 +676,7 @@ public Builder setBigQuerySource(com.google.cloud.retail.v2.BigQuerySource value
      *
      * <pre>
      * Required. BigQuery input source.
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * </pre>
@@ -701,7 +701,7 @@ public Builder setBigQuerySource(
      *
      * <pre>
      * Required. BigQuery input source.
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * </pre>
@@ -737,7 +737,7 @@ public Builder mergeBigQuerySource(com.google.cloud.retail.v2.BigQuerySource val
      *
      * <pre>
      * Required. BigQuery input source.
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * </pre>
@@ -767,7 +767,7 @@ public Builder clearBigQuerySource() {
      *
      * <pre>
      * Required. BigQuery input source.
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * </pre>
@@ -784,7 +784,7 @@ public com.google.cloud.retail.v2.BigQuerySource.Builder getBigQuerySourceBuilde
      *
      * <pre>
      * Required. BigQuery input source.
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * </pre>
@@ -809,7 +809,7 @@ public com.google.cloud.retail.v2.BigQuerySourceOrBuilder getBigQuerySourceOrBui
      *
      * <pre>
      * Required. BigQuery input source.
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * </pre>
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionDataInputConfigOrBuilder.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionDataInputConfigOrBuilder.java
index 2ce05279..04baa004 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionDataInputConfigOrBuilder.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/CompletionDataInputConfigOrBuilder.java
@@ -28,7 +28,7 @@ public interface CompletionDataInputConfigOrBuilder
    *
    * <pre>
    * Required. BigQuery input source.
-   * Add the IAM permission “BigQuery Data Viewer” for
+   * Add the IAM permission "BigQuery Data Viewer" for
    * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
    * using this feature otherwise an error is thrown.
    * </pre>
@@ -45,7 +45,7 @@ public interface CompletionDataInputConfigOrBuilder
    *
    * <pre>
    * Required. BigQuery input source.
-   * Add the IAM permission “BigQuery Data Viewer” for
+   * Add the IAM permission "BigQuery Data Viewer" for
    * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
    * using this feature otherwise an error is thrown.
    * </pre>
@@ -62,7 +62,7 @@ public interface CompletionDataInputConfigOrBuilder
    *
    * <pre>
    * Required. BigQuery input source.
-   * Add the IAM permission “BigQuery Data Viewer” for
+   * Add the IAM permission "BigQuery Data Viewer" for
    * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
    * using this feature otherwise an error is thrown.
    * </pre>
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ImportProductsRequest.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ImportProductsRequest.java
index 7b9ed09c..11ea2517 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ImportProductsRequest.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ImportProductsRequest.java
@@ -221,12 +221,12 @@ public enum ReconciliationMode implements com.google.protobuf.ProtocolMessageEnu
      * products may be deleted if they are not present in the source location.
      * Can only be while using
      * [BigQuerySource][google.cloud.retail.v2.BigQuerySource].
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      *
      * <code>FULL = 2;</code>
@@ -263,12 +263,12 @@ public enum ReconciliationMode implements com.google.protobuf.ProtocolMessageEnu
      * products may be deleted if they are not present in the source location.
      * Can only be while using
      * [BigQuerySource][google.cloud.retail.v2.BigQuerySource].
-     * Add the IAM permission “BigQuery Data Viewer” for
+     * Add the IAM permission "BigQuery Data Viewer" for
      * cloud-retail-customer-data-access&#64;system.gserviceaccount.com before
      * using this feature otherwise an error is thrown.
      * This feature is only available for users who have Retail Search enabled.
-     * Contact Retail Support (retail-search-support&#64;google.com) if you are
-     * interested in using Retail Search.
+     * Please submit a form [here](https://cloud.google.com/contact) to contact
+     * cloud sales if you are interested in using Retail Search.
      * </pre>
      *
      * <code>FULL = 2;</code>
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/Product.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/Product.java
index a4ed14a2..2a02b3a1 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/Product.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/Product.java
@@ -2046,13 +2046,9 @@ public int getAttributesCount() {
    * }`.
    * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
    * error is returned:
-   * * Max entries count: 200 by default; 100 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+   * * Max entries count: 200.
    * * The key must be a UTF-8 encoded string with a length limit of 128
    *   characters.
-   * * Max indexable entries count: 200 by default; 40 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-   * * Max searchable entries count: 30.
    * * For indexable attribute, the key must match the pattern:
    *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
    * </pre>
@@ -2091,13 +2087,9 @@ public boolean containsAttributes(java.lang.String key) {
    * }`.
    * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
    * error is returned:
-   * * Max entries count: 200 by default; 100 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+   * * Max entries count: 200.
    * * The key must be a UTF-8 encoded string with a length limit of 128
    *   characters.
-   * * Max indexable entries count: 200 by default; 40 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-   * * Max searchable entries count: 30.
    * * For indexable attribute, the key must match the pattern:
    *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
    * </pre>
@@ -2127,13 +2119,9 @@ public boolean containsAttributes(java.lang.String key) {
    * }`.
    * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
    * error is returned:
-   * * Max entries count: 200 by default; 100 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+   * * Max entries count: 200.
    * * The key must be a UTF-8 encoded string with a length limit of 128
    *   characters.
-   * * Max indexable entries count: 200 by default; 40 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-   * * Max searchable entries count: 30.
    * * For indexable attribute, the key must match the pattern:
    *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
    * </pre>
@@ -2168,13 +2156,9 @@ public com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    * }`.
    * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
    * error is returned:
-   * * Max entries count: 200 by default; 100 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+   * * Max entries count: 200.
    * * The key must be a UTF-8 encoded string with a length limit of 128
    *   characters.
-   * * Max indexable entries count: 200 by default; 40 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-   * * Max searchable entries count: 30.
    * * For indexable attribute, the key must match the pattern:
    *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
    * </pre>
@@ -3016,7 +3000,7 @@ public com.google.protobuf.ByteString getSizesBytes(int index) {
    *
    * <pre>
    * The material of the product. For example, "leather", "wooden".
-   * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+   * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
    * string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
    * Google Merchant Center property
@@ -3036,7 +3020,7 @@ public com.google.protobuf.ProtocolStringList getMaterialsList() {
    *
    * <pre>
    * The material of the product. For example, "leather", "wooden".
-   * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+   * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
    * string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
    * Google Merchant Center property
@@ -3056,7 +3040,7 @@ public int getMaterialsCount() {
    *
    * <pre>
    * The material of the product. For example, "leather", "wooden".
-   * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+   * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
    * string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
    * Google Merchant Center property
@@ -3077,7 +3061,7 @@ public java.lang.String getMaterials(int index) {
    *
    * <pre>
    * The material of the product. For example, "leather", "wooden".
-   * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+   * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
    * string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
    * Google Merchant Center property
@@ -3464,8 +3448,11 @@ public com.google.protobuf.TimestampOrBuilder getPublishTimeOrBuilder() {
    * following fields are always returned in by default:
    * * [name][google.cloud.retail.v2.Product.name]
    * * [color_info][google.cloud.retail.v2.Product.color_info]
-   * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+   * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
    * returned.
+   * Note: Returning more fields in
+   * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+   * response payload size and serving latency.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -3519,8 +3506,11 @@ public boolean hasRetrievableFields() {
    * following fields are always returned in by default:
    * * [name][google.cloud.retail.v2.Product.name]
    * * [color_info][google.cloud.retail.v2.Product.color_info]
-   * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+   * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
    * returned.
+   * Note: Returning more fields in
+   * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+   * response payload size and serving latency.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -3576,8 +3566,11 @@ public com.google.protobuf.FieldMask getRetrievableFields() {
    * following fields are always returned in by default:
    * * [name][google.cloud.retail.v2.Product.name]
    * * [color_info][google.cloud.retail.v2.Product.color_info]
-   * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+   * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
    * returned.
+   * Note: Returning more fields in
+   * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+   * response payload size and serving latency.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -7623,13 +7616,9 @@ public int getAttributesCount() {
      * }`.
      * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
      * error is returned:
-     * * Max entries count: 200 by default; 100 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+     * * Max entries count: 200.
      * * The key must be a UTF-8 encoded string with a length limit of 128
      *   characters.
-     * * Max indexable entries count: 200 by default; 40 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-     * * Max searchable entries count: 30.
      * * For indexable attribute, the key must match the pattern:
      *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
      * </pre>
@@ -7668,13 +7657,9 @@ public boolean containsAttributes(java.lang.String key) {
      * }`.
      * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
      * error is returned:
-     * * Max entries count: 200 by default; 100 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+     * * Max entries count: 200.
      * * The key must be a UTF-8 encoded string with a length limit of 128
      *   characters.
-     * * Max indexable entries count: 200 by default; 40 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-     * * Max searchable entries count: 30.
      * * For indexable attribute, the key must match the pattern:
      *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
      * </pre>
@@ -7704,13 +7689,9 @@ public boolean containsAttributes(java.lang.String key) {
      * }`.
      * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
      * error is returned:
-     * * Max entries count: 200 by default; 100 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+     * * Max entries count: 200.
      * * The key must be a UTF-8 encoded string with a length limit of 128
      *   characters.
-     * * Max indexable entries count: 200 by default; 40 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-     * * Max searchable entries count: 30.
      * * For indexable attribute, the key must match the pattern:
      *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
      * </pre>
@@ -7745,13 +7726,9 @@ public com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
      * }`.
      * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
      * error is returned:
-     * * Max entries count: 200 by default; 100 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+     * * Max entries count: 200.
      * * The key must be a UTF-8 encoded string with a length limit of 128
      *   characters.
-     * * Max indexable entries count: 200 by default; 40 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-     * * Max searchable entries count: 30.
      * * For indexable attribute, the key must match the pattern:
      *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
      * </pre>
@@ -7793,13 +7770,9 @@ public Builder clearAttributes() {
      * }`.
      * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
      * error is returned:
-     * * Max entries count: 200 by default; 100 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+     * * Max entries count: 200.
      * * The key must be a UTF-8 encoded string with a length limit of 128
      *   characters.
-     * * Max indexable entries count: 200 by default; 40 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-     * * Max searchable entries count: 30.
      * * For indexable attribute, the key must match the pattern:
      *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
      * </pre>
@@ -7837,13 +7810,9 @@ public Builder removeAttributes(java.lang.String key) {
      * }`.
      * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
      * error is returned:
-     * * Max entries count: 200 by default; 100 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+     * * Max entries count: 200.
      * * The key must be a UTF-8 encoded string with a length limit of 128
      *   characters.
-     * * Max indexable entries count: 200 by default; 40 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-     * * Max searchable entries count: 30.
      * * For indexable attribute, the key must match the pattern:
      *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
      * </pre>
@@ -7879,13 +7848,9 @@ public Builder putAttributes(
      * }`.
      * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
      * error is returned:
-     * * Max entries count: 200 by default; 100 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+     * * Max entries count: 200.
      * * The key must be a UTF-8 encoded string with a length limit of 128
      *   characters.
-     * * Max indexable entries count: 200 by default; 40 for
-     * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-     * * Max searchable entries count: 30.
      * * For indexable attribute, the key must match the pattern:
      *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
      * </pre>
@@ -10751,7 +10716,7 @@ private void ensureMaterialsIsMutable() {
      *
      * <pre>
      * The material of the product. For example, "leather", "wooden".
-     * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+     * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
      * string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
      * Google Merchant Center property
@@ -10771,7 +10736,7 @@ public com.google.protobuf.ProtocolStringList getMaterialsList() {
      *
      * <pre>
      * The material of the product. For example, "leather", "wooden".
-     * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+     * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
      * string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
      * Google Merchant Center property
@@ -10791,7 +10756,7 @@ public int getMaterialsCount() {
      *
      * <pre>
      * The material of the product. For example, "leather", "wooden".
-     * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+     * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
      * string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
      * Google Merchant Center property
@@ -10812,7 +10777,7 @@ public java.lang.String getMaterials(int index) {
      *
      * <pre>
      * The material of the product. For example, "leather", "wooden".
-     * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+     * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
      * string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
      * Google Merchant Center property
@@ -10833,7 +10798,7 @@ public com.google.protobuf.ByteString getMaterialsBytes(int index) {
      *
      * <pre>
      * The material of the product. For example, "leather", "wooden".
-     * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+     * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
      * string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
      * Google Merchant Center property
@@ -10861,7 +10826,7 @@ public Builder setMaterials(int index, java.lang.String value) {
      *
      * <pre>
      * The material of the product. For example, "leather", "wooden".
-     * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+     * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
      * string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
      * Google Merchant Center property
@@ -10888,7 +10853,7 @@ public Builder addMaterials(java.lang.String value) {
      *
      * <pre>
      * The material of the product. For example, "leather", "wooden".
-     * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+     * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
      * string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
      * Google Merchant Center property
@@ -10912,7 +10877,7 @@ public Builder addAllMaterials(java.lang.Iterable<java.lang.String> values) {
      *
      * <pre>
      * The material of the product. For example, "leather", "wooden".
-     * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+     * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
      * string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
      * Google Merchant Center property
@@ -10935,7 +10900,7 @@ public Builder clearMaterials() {
      *
      * <pre>
      * The material of the product. For example, "leather", "wooden".
-     * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+     * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
      * string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
      * Google Merchant Center property
@@ -12093,8 +12058,11 @@ public com.google.protobuf.TimestampOrBuilder getPublishTimeOrBuilder() {
      * following fields are always returned in by default:
      * * [name][google.cloud.retail.v2.Product.name]
      * * [color_info][google.cloud.retail.v2.Product.color_info]
-     * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+     * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
      * returned.
+     * Note: Returning more fields in
+     * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+     * response payload size and serving latency.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -12147,8 +12115,11 @@ public boolean hasRetrievableFields() {
      * following fields are always returned in by default:
      * * [name][google.cloud.retail.v2.Product.name]
      * * [color_info][google.cloud.retail.v2.Product.color_info]
-     * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+     * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
      * returned.
+     * Note: Returning more fields in
+     * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+     * response payload size and serving latency.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -12207,8 +12178,11 @@ public com.google.protobuf.FieldMask getRetrievableFields() {
      * following fields are always returned in by default:
      * * [name][google.cloud.retail.v2.Product.name]
      * * [color_info][google.cloud.retail.v2.Product.color_info]
-     * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+     * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
      * returned.
+     * Note: Returning more fields in
+     * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+     * response payload size and serving latency.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -12269,8 +12243,11 @@ public Builder setRetrievableFields(com.google.protobuf.FieldMask value) {
      * following fields are always returned in by default:
      * * [name][google.cloud.retail.v2.Product.name]
      * * [color_info][google.cloud.retail.v2.Product.color_info]
-     * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+     * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
      * returned.
+     * Note: Returning more fields in
+     * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+     * response payload size and serving latency.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -12328,8 +12305,11 @@ public Builder setRetrievableFields(com.google.protobuf.FieldMask.Builder builde
      * following fields are always returned in by default:
      * * [name][google.cloud.retail.v2.Product.name]
      * * [color_info][google.cloud.retail.v2.Product.color_info]
-     * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+     * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
      * returned.
+     * Note: Returning more fields in
+     * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+     * response payload size and serving latency.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -12394,8 +12374,11 @@ public Builder mergeRetrievableFields(com.google.protobuf.FieldMask value) {
      * following fields are always returned in by default:
      * * [name][google.cloud.retail.v2.Product.name]
      * * [color_info][google.cloud.retail.v2.Product.color_info]
-     * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+     * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
      * returned.
+     * Note: Returning more fields in
+     * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+     * response payload size and serving latency.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -12454,8 +12437,11 @@ public Builder clearRetrievableFields() {
      * following fields are always returned in by default:
      * * [name][google.cloud.retail.v2.Product.name]
      * * [color_info][google.cloud.retail.v2.Product.color_info]
-     * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+     * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
      * returned.
+     * Note: Returning more fields in
+     * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+     * response payload size and serving latency.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -12508,8 +12494,11 @@ public com.google.protobuf.FieldMask.Builder getRetrievableFieldsBuilder() {
      * following fields are always returned in by default:
      * * [name][google.cloud.retail.v2.Product.name]
      * * [color_info][google.cloud.retail.v2.Product.color_info]
-     * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+     * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
      * returned.
+     * Note: Returning more fields in
+     * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+     * response payload size and serving latency.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -12566,8 +12555,11 @@ public com.google.protobuf.FieldMaskOrBuilder getRetrievableFieldsOrBuilder() {
      * following fields are always returned in by default:
      * * [name][google.cloud.retail.v2.Product.name]
      * * [color_info][google.cloud.retail.v2.Product.color_info]
-     * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+     * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
      * returned.
+     * Note: Returning more fields in
+     * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+     * response payload size and serving latency.
      * </pre>
      *
      * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductDetail.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductDetail.java
index 1ee2338a..5774a629 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductDetail.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductDetail.java
@@ -139,9 +139,16 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    * <pre>
    * Required. [Product][google.cloud.retail.v2.Product] information.
-   * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-   * ingesting an event, all other product fields are ignored as we will look
-   * them up from the catalog.
+   * Required field(s):
+   * * [Product.id][google.cloud.retail.v2.Product.id]
+   * Optional override field(s):
+   * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+   * If any supported optional fields are provided, we will treat them as a full
+   * override when looking up product information from the catalog. Thus, it is
+   * important to ensure that the overriding fields are accurate and
+   * complete.
+   * All other product fields are ignored and instead populated via catalog
+   * lookup after event ingestion.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -158,9 +165,16 @@ public boolean hasProduct() {
    *
    * <pre>
    * Required. [Product][google.cloud.retail.v2.Product] information.
-   * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-   * ingesting an event, all other product fields are ignored as we will look
-   * them up from the catalog.
+   * Required field(s):
+   * * [Product.id][google.cloud.retail.v2.Product.id]
+   * Optional override field(s):
+   * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+   * If any supported optional fields are provided, we will treat them as a full
+   * override when looking up product information from the catalog. Thus, it is
+   * important to ensure that the overriding fields are accurate and
+   * complete.
+   * All other product fields are ignored and instead populated via catalog
+   * lookup after event ingestion.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -177,9 +191,16 @@ public com.google.cloud.retail.v2.Product getProduct() {
    *
    * <pre>
    * Required. [Product][google.cloud.retail.v2.Product] information.
-   * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-   * ingesting an event, all other product fields are ignored as we will look
-   * them up from the catalog.
+   * Required field(s):
+   * * [Product.id][google.cloud.retail.v2.Product.id]
+   * Optional override field(s):
+   * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+   * If any supported optional fields are provided, we will treat them as a full
+   * override when looking up product information from the catalog. Thus, it is
+   * important to ensure that the overriding fields are accurate and
+   * complete.
+   * All other product fields are ignored and instead populated via catalog
+   * lookup after event ingestion.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -611,9 +632,16 @@ public Builder mergeFrom(
      *
      * <pre>
      * Required. [Product][google.cloud.retail.v2.Product] information.
-     * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-     * ingesting an event, all other product fields are ignored as we will look
-     * them up from the catalog.
+     * Required field(s):
+     * * [Product.id][google.cloud.retail.v2.Product.id]
+     * Optional override field(s):
+     * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+     * If any supported optional fields are provided, we will treat them as a full
+     * override when looking up product information from the catalog. Thus, it is
+     * important to ensure that the overriding fields are accurate and
+     * complete.
+     * All other product fields are ignored and instead populated via catalog
+     * lookup after event ingestion.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -629,9 +657,16 @@ public boolean hasProduct() {
      *
      * <pre>
      * Required. [Product][google.cloud.retail.v2.Product] information.
-     * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-     * ingesting an event, all other product fields are ignored as we will look
-     * them up from the catalog.
+     * Required field(s):
+     * * [Product.id][google.cloud.retail.v2.Product.id]
+     * Optional override field(s):
+     * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+     * If any supported optional fields are provided, we will treat them as a full
+     * override when looking up product information from the catalog. Thus, it is
+     * important to ensure that the overriding fields are accurate and
+     * complete.
+     * All other product fields are ignored and instead populated via catalog
+     * lookup after event ingestion.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -653,9 +688,16 @@ public com.google.cloud.retail.v2.Product getProduct() {
      *
      * <pre>
      * Required. [Product][google.cloud.retail.v2.Product] information.
-     * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-     * ingesting an event, all other product fields are ignored as we will look
-     * them up from the catalog.
+     * Required field(s):
+     * * [Product.id][google.cloud.retail.v2.Product.id]
+     * Optional override field(s):
+     * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+     * If any supported optional fields are provided, we will treat them as a full
+     * override when looking up product information from the catalog. Thus, it is
+     * important to ensure that the overriding fields are accurate and
+     * complete.
+     * All other product fields are ignored and instead populated via catalog
+     * lookup after event ingestion.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -679,9 +721,16 @@ public Builder setProduct(com.google.cloud.retail.v2.Product value) {
      *
      * <pre>
      * Required. [Product][google.cloud.retail.v2.Product] information.
-     * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-     * ingesting an event, all other product fields are ignored as we will look
-     * them up from the catalog.
+     * Required field(s):
+     * * [Product.id][google.cloud.retail.v2.Product.id]
+     * Optional override field(s):
+     * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+     * If any supported optional fields are provided, we will treat them as a full
+     * override when looking up product information from the catalog. Thus, it is
+     * important to ensure that the overriding fields are accurate and
+     * complete.
+     * All other product fields are ignored and instead populated via catalog
+     * lookup after event ingestion.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -702,9 +751,16 @@ public Builder setProduct(com.google.cloud.retail.v2.Product.Builder builderForV
      *
      * <pre>
      * Required. [Product][google.cloud.retail.v2.Product] information.
-     * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-     * ingesting an event, all other product fields are ignored as we will look
-     * them up from the catalog.
+     * Required field(s):
+     * * [Product.id][google.cloud.retail.v2.Product.id]
+     * Optional override field(s):
+     * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+     * If any supported optional fields are provided, we will treat them as a full
+     * override when looking up product information from the catalog. Thus, it is
+     * important to ensure that the overriding fields are accurate and
+     * complete.
+     * All other product fields are ignored and instead populated via catalog
+     * lookup after event ingestion.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -732,9 +788,16 @@ public Builder mergeProduct(com.google.cloud.retail.v2.Product value) {
      *
      * <pre>
      * Required. [Product][google.cloud.retail.v2.Product] information.
-     * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-     * ingesting an event, all other product fields are ignored as we will look
-     * them up from the catalog.
+     * Required field(s):
+     * * [Product.id][google.cloud.retail.v2.Product.id]
+     * Optional override field(s):
+     * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+     * If any supported optional fields are provided, we will treat them as a full
+     * override when looking up product information from the catalog. Thus, it is
+     * important to ensure that the overriding fields are accurate and
+     * complete.
+     * All other product fields are ignored and instead populated via catalog
+     * lookup after event ingestion.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -756,9 +819,16 @@ public Builder clearProduct() {
      *
      * <pre>
      * Required. [Product][google.cloud.retail.v2.Product] information.
-     * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-     * ingesting an event, all other product fields are ignored as we will look
-     * them up from the catalog.
+     * Required field(s):
+     * * [Product.id][google.cloud.retail.v2.Product.id]
+     * Optional override field(s):
+     * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+     * If any supported optional fields are provided, we will treat them as a full
+     * override when looking up product information from the catalog. Thus, it is
+     * important to ensure that the overriding fields are accurate and
+     * complete.
+     * All other product fields are ignored and instead populated via catalog
+     * lookup after event ingestion.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -774,9 +844,16 @@ public com.google.cloud.retail.v2.Product.Builder getProductBuilder() {
      *
      * <pre>
      * Required. [Product][google.cloud.retail.v2.Product] information.
-     * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-     * ingesting an event, all other product fields are ignored as we will look
-     * them up from the catalog.
+     * Required field(s):
+     * * [Product.id][google.cloud.retail.v2.Product.id]
+     * Optional override field(s):
+     * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+     * If any supported optional fields are provided, we will treat them as a full
+     * override when looking up product information from the catalog. Thus, it is
+     * important to ensure that the overriding fields are accurate and
+     * complete.
+     * All other product fields are ignored and instead populated via catalog
+     * lookup after event ingestion.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -796,9 +873,16 @@ public com.google.cloud.retail.v2.ProductOrBuilder getProductOrBuilder() {
      *
      * <pre>
      * Required. [Product][google.cloud.retail.v2.Product] information.
-     * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-     * ingesting an event, all other product fields are ignored as we will look
-     * them up from the catalog.
+     * Required field(s):
+     * * [Product.id][google.cloud.retail.v2.Product.id]
+     * Optional override field(s):
+     * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+     * If any supported optional fields are provided, we will treat them as a full
+     * override when looking up product information from the catalog. Thus, it is
+     * important to ensure that the overriding fields are accurate and
+     * complete.
+     * All other product fields are ignored and instead populated via catalog
+     * lookup after event ingestion.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductDetailOrBuilder.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductDetailOrBuilder.java
index 1506b07e..3ffec3d2 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductDetailOrBuilder.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductDetailOrBuilder.java
@@ -28,9 +28,16 @@ public interface ProductDetailOrBuilder
    *
    * <pre>
    * Required. [Product][google.cloud.retail.v2.Product] information.
-   * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-   * ingesting an event, all other product fields are ignored as we will look
-   * them up from the catalog.
+   * Required field(s):
+   * * [Product.id][google.cloud.retail.v2.Product.id]
+   * Optional override field(s):
+   * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+   * If any supported optional fields are provided, we will treat them as a full
+   * override when looking up product information from the catalog. Thus, it is
+   * important to ensure that the overriding fields are accurate and
+   * complete.
+   * All other product fields are ignored and instead populated via catalog
+   * lookup after event ingestion.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -44,9 +51,16 @@ public interface ProductDetailOrBuilder
    *
    * <pre>
    * Required. [Product][google.cloud.retail.v2.Product] information.
-   * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-   * ingesting an event, all other product fields are ignored as we will look
-   * them up from the catalog.
+   * Required field(s):
+   * * [Product.id][google.cloud.retail.v2.Product.id]
+   * Optional override field(s):
+   * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+   * If any supported optional fields are provided, we will treat them as a full
+   * override when looking up product information from the catalog. Thus, it is
+   * important to ensure that the overriding fields are accurate and
+   * complete.
+   * All other product fields are ignored and instead populated via catalog
+   * lookup after event ingestion.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
@@ -60,9 +74,16 @@ public interface ProductDetailOrBuilder
    *
    * <pre>
    * Required. [Product][google.cloud.retail.v2.Product] information.
-   * Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-   * ingesting an event, all other product fields are ignored as we will look
-   * them up from the catalog.
+   * Required field(s):
+   * * [Product.id][google.cloud.retail.v2.Product.id]
+   * Optional override field(s):
+   * * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+   * If any supported optional fields are provided, we will treat them as a full
+   * override when looking up product information from the catalog. Thus, it is
+   * important to ensure that the overriding fields are accurate and
+   * complete.
+   * All other product fields are ignored and instead populated via catalog
+   * lookup after event ingestion.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.Product product = 1 [(.google.api.field_behavior) = REQUIRED];
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductOrBuilder.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductOrBuilder.java
index e1659da5..5f03dea3 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductOrBuilder.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductOrBuilder.java
@@ -792,13 +792,9 @@ public interface ProductOrBuilder
    * }`.
    * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
    * error is returned:
-   * * Max entries count: 200 by default; 100 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+   * * Max entries count: 200.
    * * The key must be a UTF-8 encoded string with a length limit of 128
    *   characters.
-   * * Max indexable entries count: 200 by default; 40 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-   * * Max searchable entries count: 30.
    * * For indexable attribute, the key must match the pattern:
    *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
    * </pre>
@@ -824,13 +820,9 @@ public interface ProductOrBuilder
    * }`.
    * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
    * error is returned:
-   * * Max entries count: 200 by default; 100 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+   * * Max entries count: 200.
    * * The key must be a UTF-8 encoded string with a length limit of 128
    *   characters.
-   * * Max indexable entries count: 200 by default; 40 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-   * * Max searchable entries count: 30.
    * * For indexable attribute, the key must match the pattern:
    *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
    * </pre>
@@ -859,13 +851,9 @@ public interface ProductOrBuilder
    * }`.
    * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
    * error is returned:
-   * * Max entries count: 200 by default; 100 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+   * * Max entries count: 200.
    * * The key must be a UTF-8 encoded string with a length limit of 128
    *   characters.
-   * * Max indexable entries count: 200 by default; 40 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-   * * Max searchable entries count: 30.
    * * For indexable attribute, the key must match the pattern:
    *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
    * </pre>
@@ -891,13 +879,9 @@ public interface ProductOrBuilder
    * }`.
    * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
    * error is returned:
-   * * Max entries count: 200 by default; 100 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+   * * Max entries count: 200.
    * * The key must be a UTF-8 encoded string with a length limit of 128
    *   characters.
-   * * Max indexable entries count: 200 by default; 40 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-   * * Max searchable entries count: 30.
    * * For indexable attribute, the key must match the pattern:
    *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
    * </pre>
@@ -924,13 +908,9 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    * }`.
    * This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
    * error is returned:
-   * * Max entries count: 200 by default; 100 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+   * * Max entries count: 200.
    * * The key must be a UTF-8 encoded string with a length limit of 128
    *   characters.
-   * * Max indexable entries count: 200 by default; 40 for
-   * [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-   * * Max searchable entries count: 30.
    * * For indexable attribute, the key must match the pattern:
    *   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
    * </pre>
@@ -1594,7 +1574,7 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    *
    * <pre>
    * The material of the product. For example, "leather", "wooden".
-   * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+   * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
    * string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
    * Google Merchant Center property
@@ -1612,7 +1592,7 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    *
    * <pre>
    * The material of the product. For example, "leather", "wooden".
-   * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+   * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
    * string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
    * Google Merchant Center property
@@ -1630,7 +1610,7 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    *
    * <pre>
    * The material of the product. For example, "leather", "wooden".
-   * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+   * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
    * string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
    * Google Merchant Center property
@@ -1649,7 +1629,7 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    *
    * <pre>
    * The material of the product. For example, "leather", "wooden".
-   * A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+   * A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
    * string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
    * Google Merchant Center property
@@ -1984,8 +1964,11 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    * following fields are always returned in by default:
    * * [name][google.cloud.retail.v2.Product.name]
    * * [color_info][google.cloud.retail.v2.Product.color_info]
-   * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+   * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
    * returned.
+   * Note: Returning more fields in
+   * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+   * response payload size and serving latency.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -2036,8 +2019,11 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    * following fields are always returned in by default:
    * * [name][google.cloud.retail.v2.Product.name]
    * * [color_info][google.cloud.retail.v2.Product.color_info]
-   * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+   * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
    * returned.
+   * Note: Returning more fields in
+   * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+   * response payload size and serving latency.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
@@ -2088,8 +2074,11 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    * following fields are always returned in by default:
    * * [name][google.cloud.retail.v2.Product.name]
    * * [color_info][google.cloud.retail.v2.Product.color_info]
-   * Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+   * Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
    * returned.
+   * Note: Returning more fields in
+   * [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+   * response payload size and serving latency.
    * </pre>
    *
    * <code>.google.protobuf.FieldMask retrievable_fields = 30;</code>
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java
index 99c85998..0b11522e 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java
@@ -633,34 +633,34 @@ public interface FacetKeyOrBuilder
        * Allowed facet keys when
        * [FacetKey.query][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.query]
        * is not specified:
-       * Textual facet keys:
-       * * brands
-       * * categories
-       * * genders
-       * * ageGroups
-       * * availability
-       * * colorFamilies
-       * * colors
-       * * sizes
-       * * materials
-       * * patterns
-       * * conditions
-       * * attributes.key
-       * * pickupInStore
-       * * shipToStore
-       * * sameDayDelivery
-       * * nextDayDelivery
-       * * customFulfillment1
-       * * customFulfillment2
-       * * customFulfillment3
-       * * customFulfillment4
-       * * customFulfillment5
-       * Numeric facet keys:
-       * * price
-       * * discount
-       * * rating
-       * * ratingCount
-       * * attributes.key
+       * * textual_field =
+       *     * "brands"
+       *     * "categories"
+       *     * "genders"
+       *     * "ageGroups"
+       *     * "availability"
+       *     * "colorFamilies"
+       *     * "colors"
+       *     * "sizes"
+       *     * "materials"
+       *     * "patterns"
+       *     * "conditions"
+       *     * "attributes.key"
+       *     * "pickupInStore"
+       *     * "shipToStore"
+       *     * "sameDayDelivery"
+       *     * "nextDayDelivery"
+       *     * "customFulfillment1"
+       *     * "customFulfillment2"
+       *     * "customFulfillment3"
+       *     * "customFulfillment4"
+       *     * "customFulfillment5"
+       * * numerical_field =
+       *     * "price"
+       *     * "discount"
+       *     * "rating"
+       *     * "ratingCount"
+       *     * "attributes.key"
        * </pre>
        *
        * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -678,34 +678,34 @@ public interface FacetKeyOrBuilder
        * Allowed facet keys when
        * [FacetKey.query][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.query]
        * is not specified:
-       * Textual facet keys:
-       * * brands
-       * * categories
-       * * genders
-       * * ageGroups
-       * * availability
-       * * colorFamilies
-       * * colors
-       * * sizes
-       * * materials
-       * * patterns
-       * * conditions
-       * * attributes.key
-       * * pickupInStore
-       * * shipToStore
-       * * sameDayDelivery
-       * * nextDayDelivery
-       * * customFulfillment1
-       * * customFulfillment2
-       * * customFulfillment3
-       * * customFulfillment4
-       * * customFulfillment5
-       * Numeric facet keys:
-       * * price
-       * * discount
-       * * rating
-       * * ratingCount
-       * * attributes.key
+       * * textual_field =
+       *     * "brands"
+       *     * "categories"
+       *     * "genders"
+       *     * "ageGroups"
+       *     * "availability"
+       *     * "colorFamilies"
+       *     * "colors"
+       *     * "sizes"
+       *     * "materials"
+       *     * "patterns"
+       *     * "conditions"
+       *     * "attributes.key"
+       *     * "pickupInStore"
+       *     * "shipToStore"
+       *     * "sameDayDelivery"
+       *     * "nextDayDelivery"
+       *     * "customFulfillment1"
+       *     * "customFulfillment2"
+       *     * "customFulfillment3"
+       *     * "customFulfillment4"
+       *     * "customFulfillment5"
+       * * numerical_field =
+       *     * "price"
+       *     * "discount"
+       *     * "rating"
+       *     * "ratingCount"
+       *     * "attributes.key"
        * </pre>
        *
        * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1032,7 +1032,8 @@ public interface FacetKeyOrBuilder
        * order](https://en.wikipedia.org/wiki/Natural_sort_order); numerical
        * intervals are sorted in the order given by
        * [FacetSpec.FacetKey.intervals][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.intervals];
-       * [FulfillmentInfo.ids][] are sorted in the order given by
+       * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+       * are sorted in the order given by
        * [FacetSpec.FacetKey.restricted_values][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.restricted_values].
        * </pre>
        *
@@ -1056,7 +1057,8 @@ public interface FacetKeyOrBuilder
        * order](https://en.wikipedia.org/wiki/Natural_sort_order); numerical
        * intervals are sorted in the order given by
        * [FacetSpec.FacetKey.intervals][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.intervals];
-       * [FulfillmentInfo.ids][] are sorted in the order given by
+       * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+       * are sorted in the order given by
        * [FacetSpec.FacetKey.restricted_values][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.restricted_values].
        * </pre>
        *
@@ -1305,34 +1307,34 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        * Allowed facet keys when
        * [FacetKey.query][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.query]
        * is not specified:
-       * Textual facet keys:
-       * * brands
-       * * categories
-       * * genders
-       * * ageGroups
-       * * availability
-       * * colorFamilies
-       * * colors
-       * * sizes
-       * * materials
-       * * patterns
-       * * conditions
-       * * attributes.key
-       * * pickupInStore
-       * * shipToStore
-       * * sameDayDelivery
-       * * nextDayDelivery
-       * * customFulfillment1
-       * * customFulfillment2
-       * * customFulfillment3
-       * * customFulfillment4
-       * * customFulfillment5
-       * Numeric facet keys:
-       * * price
-       * * discount
-       * * rating
-       * * ratingCount
-       * * attributes.key
+       * * textual_field =
+       *     * "brands"
+       *     * "categories"
+       *     * "genders"
+       *     * "ageGroups"
+       *     * "availability"
+       *     * "colorFamilies"
+       *     * "colors"
+       *     * "sizes"
+       *     * "materials"
+       *     * "patterns"
+       *     * "conditions"
+       *     * "attributes.key"
+       *     * "pickupInStore"
+       *     * "shipToStore"
+       *     * "sameDayDelivery"
+       *     * "nextDayDelivery"
+       *     * "customFulfillment1"
+       *     * "customFulfillment2"
+       *     * "customFulfillment3"
+       *     * "customFulfillment4"
+       *     * "customFulfillment5"
+       * * numerical_field =
+       *     * "price"
+       *     * "discount"
+       *     * "rating"
+       *     * "ratingCount"
+       *     * "attributes.key"
        * </pre>
        *
        * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1361,34 +1363,34 @@ public java.lang.String getKey() {
        * Allowed facet keys when
        * [FacetKey.query][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.query]
        * is not specified:
-       * Textual facet keys:
-       * * brands
-       * * categories
-       * * genders
-       * * ageGroups
-       * * availability
-       * * colorFamilies
-       * * colors
-       * * sizes
-       * * materials
-       * * patterns
-       * * conditions
-       * * attributes.key
-       * * pickupInStore
-       * * shipToStore
-       * * sameDayDelivery
-       * * nextDayDelivery
-       * * customFulfillment1
-       * * customFulfillment2
-       * * customFulfillment3
-       * * customFulfillment4
-       * * customFulfillment5
-       * Numeric facet keys:
-       * * price
-       * * discount
-       * * rating
-       * * ratingCount
-       * * attributes.key
+       * * textual_field =
+       *     * "brands"
+       *     * "categories"
+       *     * "genders"
+       *     * "ageGroups"
+       *     * "availability"
+       *     * "colorFamilies"
+       *     * "colors"
+       *     * "sizes"
+       *     * "materials"
+       *     * "patterns"
+       *     * "conditions"
+       *     * "attributes.key"
+       *     * "pickupInStore"
+       *     * "shipToStore"
+       *     * "sameDayDelivery"
+       *     * "nextDayDelivery"
+       *     * "customFulfillment1"
+       *     * "customFulfillment2"
+       *     * "customFulfillment3"
+       *     * "customFulfillment4"
+       *     * "customFulfillment5"
+       * * numerical_field =
+       *     * "price"
+       *     * "discount"
+       *     * "rating"
+       *     * "ratingCount"
+       *     * "attributes.key"
        * </pre>
        *
        * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -1775,7 +1777,8 @@ public com.google.protobuf.ByteString getContainsBytes(int index) {
        * order](https://en.wikipedia.org/wiki/Natural_sort_order); numerical
        * intervals are sorted in the order given by
        * [FacetSpec.FacetKey.intervals][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.intervals];
-       * [FulfillmentInfo.ids][] are sorted in the order given by
+       * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+       * are sorted in the order given by
        * [FacetSpec.FacetKey.restricted_values][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.restricted_values].
        * </pre>
        *
@@ -1810,7 +1813,8 @@ public java.lang.String getOrderBy() {
        * order](https://en.wikipedia.org/wiki/Natural_sort_order); numerical
        * intervals are sorted in the order given by
        * [FacetSpec.FacetKey.intervals][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.intervals];
-       * [FulfillmentInfo.ids][] are sorted in the order given by
+       * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+       * are sorted in the order given by
        * [FacetSpec.FacetKey.restricted_values][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.restricted_values].
        * </pre>
        *
@@ -2442,34 +2446,34 @@ public Builder mergeFrom(
          * Allowed facet keys when
          * [FacetKey.query][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.query]
          * is not specified:
-         * Textual facet keys:
-         * * brands
-         * * categories
-         * * genders
-         * * ageGroups
-         * * availability
-         * * colorFamilies
-         * * colors
-         * * sizes
-         * * materials
-         * * patterns
-         * * conditions
-         * * attributes.key
-         * * pickupInStore
-         * * shipToStore
-         * * sameDayDelivery
-         * * nextDayDelivery
-         * * customFulfillment1
-         * * customFulfillment2
-         * * customFulfillment3
-         * * customFulfillment4
-         * * customFulfillment5
-         * Numeric facet keys:
-         * * price
-         * * discount
-         * * rating
-         * * ratingCount
-         * * attributes.key
+         * * textual_field =
+         *     * "brands"
+         *     * "categories"
+         *     * "genders"
+         *     * "ageGroups"
+         *     * "availability"
+         *     * "colorFamilies"
+         *     * "colors"
+         *     * "sizes"
+         *     * "materials"
+         *     * "patterns"
+         *     * "conditions"
+         *     * "attributes.key"
+         *     * "pickupInStore"
+         *     * "shipToStore"
+         *     * "sameDayDelivery"
+         *     * "nextDayDelivery"
+         *     * "customFulfillment1"
+         *     * "customFulfillment2"
+         *     * "customFulfillment3"
+         *     * "customFulfillment4"
+         *     * "customFulfillment5"
+         * * numerical_field =
+         *     * "price"
+         *     * "discount"
+         *     * "rating"
+         *     * "ratingCount"
+         *     * "attributes.key"
          * </pre>
          *
          * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -2497,34 +2501,34 @@ public java.lang.String getKey() {
          * Allowed facet keys when
          * [FacetKey.query][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.query]
          * is not specified:
-         * Textual facet keys:
-         * * brands
-         * * categories
-         * * genders
-         * * ageGroups
-         * * availability
-         * * colorFamilies
-         * * colors
-         * * sizes
-         * * materials
-         * * patterns
-         * * conditions
-         * * attributes.key
-         * * pickupInStore
-         * * shipToStore
-         * * sameDayDelivery
-         * * nextDayDelivery
-         * * customFulfillment1
-         * * customFulfillment2
-         * * customFulfillment3
-         * * customFulfillment4
-         * * customFulfillment5
-         * Numeric facet keys:
-         * * price
-         * * discount
-         * * rating
-         * * ratingCount
-         * * attributes.key
+         * * textual_field =
+         *     * "brands"
+         *     * "categories"
+         *     * "genders"
+         *     * "ageGroups"
+         *     * "availability"
+         *     * "colorFamilies"
+         *     * "colors"
+         *     * "sizes"
+         *     * "materials"
+         *     * "patterns"
+         *     * "conditions"
+         *     * "attributes.key"
+         *     * "pickupInStore"
+         *     * "shipToStore"
+         *     * "sameDayDelivery"
+         *     * "nextDayDelivery"
+         *     * "customFulfillment1"
+         *     * "customFulfillment2"
+         *     * "customFulfillment3"
+         *     * "customFulfillment4"
+         *     * "customFulfillment5"
+         * * numerical_field =
+         *     * "price"
+         *     * "discount"
+         *     * "rating"
+         *     * "ratingCount"
+         *     * "attributes.key"
          * </pre>
          *
          * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -2552,34 +2556,34 @@ public com.google.protobuf.ByteString getKeyBytes() {
          * Allowed facet keys when
          * [FacetKey.query][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.query]
          * is not specified:
-         * Textual facet keys:
-         * * brands
-         * * categories
-         * * genders
-         * * ageGroups
-         * * availability
-         * * colorFamilies
-         * * colors
-         * * sizes
-         * * materials
-         * * patterns
-         * * conditions
-         * * attributes.key
-         * * pickupInStore
-         * * shipToStore
-         * * sameDayDelivery
-         * * nextDayDelivery
-         * * customFulfillment1
-         * * customFulfillment2
-         * * customFulfillment3
-         * * customFulfillment4
-         * * customFulfillment5
-         * Numeric facet keys:
-         * * price
-         * * discount
-         * * rating
-         * * ratingCount
-         * * attributes.key
+         * * textual_field =
+         *     * "brands"
+         *     * "categories"
+         *     * "genders"
+         *     * "ageGroups"
+         *     * "availability"
+         *     * "colorFamilies"
+         *     * "colors"
+         *     * "sizes"
+         *     * "materials"
+         *     * "patterns"
+         *     * "conditions"
+         *     * "attributes.key"
+         *     * "pickupInStore"
+         *     * "shipToStore"
+         *     * "sameDayDelivery"
+         *     * "nextDayDelivery"
+         *     * "customFulfillment1"
+         *     * "customFulfillment2"
+         *     * "customFulfillment3"
+         *     * "customFulfillment4"
+         *     * "customFulfillment5"
+         * * numerical_field =
+         *     * "price"
+         *     * "discount"
+         *     * "rating"
+         *     * "ratingCount"
+         *     * "attributes.key"
          * </pre>
          *
          * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -2606,34 +2610,34 @@ public Builder setKey(java.lang.String value) {
          * Allowed facet keys when
          * [FacetKey.query][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.query]
          * is not specified:
-         * Textual facet keys:
-         * * brands
-         * * categories
-         * * genders
-         * * ageGroups
-         * * availability
-         * * colorFamilies
-         * * colors
-         * * sizes
-         * * materials
-         * * patterns
-         * * conditions
-         * * attributes.key
-         * * pickupInStore
-         * * shipToStore
-         * * sameDayDelivery
-         * * nextDayDelivery
-         * * customFulfillment1
-         * * customFulfillment2
-         * * customFulfillment3
-         * * customFulfillment4
-         * * customFulfillment5
-         * Numeric facet keys:
-         * * price
-         * * discount
-         * * rating
-         * * ratingCount
-         * * attributes.key
+         * * textual_field =
+         *     * "brands"
+         *     * "categories"
+         *     * "genders"
+         *     * "ageGroups"
+         *     * "availability"
+         *     * "colorFamilies"
+         *     * "colors"
+         *     * "sizes"
+         *     * "materials"
+         *     * "patterns"
+         *     * "conditions"
+         *     * "attributes.key"
+         *     * "pickupInStore"
+         *     * "shipToStore"
+         *     * "sameDayDelivery"
+         *     * "nextDayDelivery"
+         *     * "customFulfillment1"
+         *     * "customFulfillment2"
+         *     * "customFulfillment3"
+         *     * "customFulfillment4"
+         *     * "customFulfillment5"
+         * * numerical_field =
+         *     * "price"
+         *     * "discount"
+         *     * "rating"
+         *     * "ratingCount"
+         *     * "attributes.key"
          * </pre>
          *
          * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -2656,34 +2660,34 @@ public Builder clearKey() {
          * Allowed facet keys when
          * [FacetKey.query][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.query]
          * is not specified:
-         * Textual facet keys:
-         * * brands
-         * * categories
-         * * genders
-         * * ageGroups
-         * * availability
-         * * colorFamilies
-         * * colors
-         * * sizes
-         * * materials
-         * * patterns
-         * * conditions
-         * * attributes.key
-         * * pickupInStore
-         * * shipToStore
-         * * sameDayDelivery
-         * * nextDayDelivery
-         * * customFulfillment1
-         * * customFulfillment2
-         * * customFulfillment3
-         * * customFulfillment4
-         * * customFulfillment5
-         * Numeric facet keys:
-         * * price
-         * * discount
-         * * rating
-         * * ratingCount
-         * * attributes.key
+         * * textual_field =
+         *     * "brands"
+         *     * "categories"
+         *     * "genders"
+         *     * "ageGroups"
+         *     * "availability"
+         *     * "colorFamilies"
+         *     * "colors"
+         *     * "sizes"
+         *     * "materials"
+         *     * "patterns"
+         *     * "conditions"
+         *     * "attributes.key"
+         *     * "pickupInStore"
+         *     * "shipToStore"
+         *     * "sameDayDelivery"
+         *     * "nextDayDelivery"
+         *     * "customFulfillment1"
+         *     * "customFulfillment2"
+         *     * "customFulfillment3"
+         *     * "customFulfillment4"
+         *     * "customFulfillment5"
+         * * numerical_field =
+         *     * "price"
+         *     * "discount"
+         *     * "rating"
+         *     * "ratingCount"
+         *     * "attributes.key"
          * </pre>
          *
          * <code>string key = 1 [(.google.api.field_behavior) = REQUIRED];</code>
@@ -3808,7 +3812,8 @@ public Builder addContainsBytes(com.google.protobuf.ByteString value) {
          * order](https://en.wikipedia.org/wiki/Natural_sort_order); numerical
          * intervals are sorted in the order given by
          * [FacetSpec.FacetKey.intervals][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.intervals];
-         * [FulfillmentInfo.ids][] are sorted in the order given by
+         * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+         * are sorted in the order given by
          * [FacetSpec.FacetKey.restricted_values][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.restricted_values].
          * </pre>
          *
@@ -3842,7 +3847,8 @@ public java.lang.String getOrderBy() {
          * order](https://en.wikipedia.org/wiki/Natural_sort_order); numerical
          * intervals are sorted in the order given by
          * [FacetSpec.FacetKey.intervals][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.intervals];
-         * [FulfillmentInfo.ids][] are sorted in the order given by
+         * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+         * are sorted in the order given by
          * [FacetSpec.FacetKey.restricted_values][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.restricted_values].
          * </pre>
          *
@@ -3876,7 +3882,8 @@ public com.google.protobuf.ByteString getOrderByBytes() {
          * order](https://en.wikipedia.org/wiki/Natural_sort_order); numerical
          * intervals are sorted in the order given by
          * [FacetSpec.FacetKey.intervals][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.intervals];
-         * [FulfillmentInfo.ids][] are sorted in the order given by
+         * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+         * are sorted in the order given by
          * [FacetSpec.FacetKey.restricted_values][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.restricted_values].
          * </pre>
          *
@@ -3909,7 +3916,8 @@ public Builder setOrderBy(java.lang.String value) {
          * order](https://en.wikipedia.org/wiki/Natural_sort_order); numerical
          * intervals are sorted in the order given by
          * [FacetSpec.FacetKey.intervals][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.intervals];
-         * [FulfillmentInfo.ids][] are sorted in the order given by
+         * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+         * are sorted in the order given by
          * [FacetSpec.FacetKey.restricted_values][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.restricted_values].
          * </pre>
          *
@@ -3938,7 +3946,8 @@ public Builder clearOrderBy() {
          * order](https://en.wikipedia.org/wiki/Natural_sort_order); numerical
          * intervals are sorted in the order given by
          * [FacetSpec.FacetKey.intervals][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.intervals];
-         * [FulfillmentInfo.ids][] are sorted in the order given by
+         * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+         * are sorted in the order given by
          * [FacetSpec.FacetKey.restricted_values][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.restricted_values].
          * </pre>
          *
@@ -6579,12 +6588,11 @@ public interface ConditionBoostSpecOrBuilder
        * detail syntax and limitations.
        * Examples:
        * * To boost products with product ID "product_1" or "product_2", and
-       * color "Red" or "Blue":
-       *   ```
-       *   (id: ANY("product_1", "product_2"))
-       *   AND
-       *   (colorFamilies: ANY("Red", "Blue"))
-       *   ```
+       * color
+       *   "Red" or "Blue":&lt;br&gt;
+       *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
+       *   *AND&lt;br&gt;*
+       *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
        * </pre>
        *
        * <code>string condition = 1;</code>
@@ -6602,12 +6610,11 @@ public interface ConditionBoostSpecOrBuilder
        * detail syntax and limitations.
        * Examples:
        * * To boost products with product ID "product_1" or "product_2", and
-       * color "Red" or "Blue":
-       *   ```
-       *   (id: ANY("product_1", "product_2"))
-       *   AND
-       *   (colorFamilies: ANY("Red", "Blue"))
-       *   ```
+       * color
+       *   "Red" or "Blue":&lt;br&gt;
+       *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
+       *   *AND&lt;br&gt;*
+       *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
        * </pre>
        *
        * <code>string condition = 1;</code>
@@ -6754,12 +6761,11 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        * detail syntax and limitations.
        * Examples:
        * * To boost products with product ID "product_1" or "product_2", and
-       * color "Red" or "Blue":
-       *   ```
-       *   (id: ANY("product_1", "product_2"))
-       *   AND
-       *   (colorFamilies: ANY("Red", "Blue"))
-       *   ```
+       * color
+       *   "Red" or "Blue":&lt;br&gt;
+       *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
+       *   *AND&lt;br&gt;*
+       *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
        * </pre>
        *
        * <code>string condition = 1;</code>
@@ -6788,12 +6794,11 @@ public java.lang.String getCondition() {
        * detail syntax and limitations.
        * Examples:
        * * To boost products with product ID "product_1" or "product_2", and
-       * color "Red" or "Blue":
-       *   ```
-       *   (id: ANY("product_1", "product_2"))
-       *   AND
-       *   (colorFamilies: ANY("Red", "Blue"))
-       *   ```
+       * color
+       *   "Red" or "Blue":&lt;br&gt;
+       *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
+       *   *AND&lt;br&gt;*
+       *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
        * </pre>
        *
        * <code>string condition = 1;</code>
@@ -7209,12 +7214,11 @@ public Builder mergeFrom(
          * detail syntax and limitations.
          * Examples:
          * * To boost products with product ID "product_1" or "product_2", and
-         * color "Red" or "Blue":
-         *   ```
-         *   (id: ANY("product_1", "product_2"))
-         *   AND
-         *   (colorFamilies: ANY("Red", "Blue"))
-         *   ```
+         * color
+         *   "Red" or "Blue":&lt;br&gt;
+         *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
+         *   *AND&lt;br&gt;*
+         *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
          * </pre>
          *
          * <code>string condition = 1;</code>
@@ -7242,12 +7246,11 @@ public java.lang.String getCondition() {
          * detail syntax and limitations.
          * Examples:
          * * To boost products with product ID "product_1" or "product_2", and
-         * color "Red" or "Blue":
-         *   ```
-         *   (id: ANY("product_1", "product_2"))
-         *   AND
-         *   (colorFamilies: ANY("Red", "Blue"))
-         *   ```
+         * color
+         *   "Red" or "Blue":&lt;br&gt;
+         *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
+         *   *AND&lt;br&gt;*
+         *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
          * </pre>
          *
          * <code>string condition = 1;</code>
@@ -7275,12 +7278,11 @@ public com.google.protobuf.ByteString getConditionBytes() {
          * detail syntax and limitations.
          * Examples:
          * * To boost products with product ID "product_1" or "product_2", and
-         * color "Red" or "Blue":
-         *   ```
-         *   (id: ANY("product_1", "product_2"))
-         *   AND
-         *   (colorFamilies: ANY("Red", "Blue"))
-         *   ```
+         * color
+         *   "Red" or "Blue":&lt;br&gt;
+         *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
+         *   *AND&lt;br&gt;*
+         *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
          * </pre>
          *
          * <code>string condition = 1;</code>
@@ -7307,12 +7309,11 @@ public Builder setCondition(java.lang.String value) {
          * detail syntax and limitations.
          * Examples:
          * * To boost products with product ID "product_1" or "product_2", and
-         * color "Red" or "Blue":
-         *   ```
-         *   (id: ANY("product_1", "product_2"))
-         *   AND
-         *   (colorFamilies: ANY("Red", "Blue"))
-         *   ```
+         * color
+         *   "Red" or "Blue":&lt;br&gt;
+         *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
+         *   *AND&lt;br&gt;*
+         *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
          * </pre>
          *
          * <code>string condition = 1;</code>
@@ -7335,12 +7336,11 @@ public Builder clearCondition() {
          * detail syntax and limitations.
          * Examples:
          * * To boost products with product ID "product_1" or "product_2", and
-         * color "Red" or "Blue":
-         *   ```
-         *   (id: ANY("product_1", "product_2"))
-         *   AND
-         *   (colorFamilies: ANY("Red", "Blue"))
-         *   ```
+         * color
+         *   "Red" or "Blue":&lt;br&gt;
+         *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
+         *   *AND&lt;br&gt;*
+         *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
          * </pre>
          *
          * <code>string condition = 1;</code>
@@ -8527,6 +8527,21 @@ public interface QueryExpansionSpecOrBuilder
      * @return The condition.
      */
     com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec.Condition getCondition();
+
+    /**
+     *
+     *
+     * <pre>
+     * Whether to pin unexpanded results. If this field is set to true,
+     * unexpanded products are always at the top of the search results, followed
+     * by the expanded results.
+     * </pre>
+     *
+     * <code>bool pin_unexpanded_results = 2;</code>
+     *
+     * @return The pinUnexpandedResults.
+     */
+    boolean getPinUnexpandedResults();
   }
   /**
    *
@@ -8588,6 +8603,11 @@ private QueryExpansionSpec(
                 condition_ = rawValue;
                 break;
               }
+            case 16:
+              {
+                pinUnexpandedResults_ = input.readBool();
+                break;
+              }
             default:
               {
                 if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -8829,6 +8849,26 @@ public com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec.Condition get
           : result;
     }
 
+    public static final int PIN_UNEXPANDED_RESULTS_FIELD_NUMBER = 2;
+    private boolean pinUnexpandedResults_;
+    /**
+     *
+     *
+     * <pre>
+     * Whether to pin unexpanded results. If this field is set to true,
+     * unexpanded products are always at the top of the search results, followed
+     * by the expanded results.
+     * </pre>
+     *
+     * <code>bool pin_unexpanded_results = 2;</code>
+     *
+     * @return The pinUnexpandedResults.
+     */
+    @java.lang.Override
+    public boolean getPinUnexpandedResults() {
+      return pinUnexpandedResults_;
+    }
+
     private byte memoizedIsInitialized = -1;
 
     @java.lang.Override
@@ -8849,6 +8889,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
               .getNumber()) {
         output.writeEnum(1, condition_);
       }
+      if (pinUnexpandedResults_ != false) {
+        output.writeBool(2, pinUnexpandedResults_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -8864,6 +8907,9 @@ public int getSerializedSize() {
               .getNumber()) {
         size += com.google.protobuf.CodedOutputStream.computeEnumSize(1, condition_);
       }
+      if (pinUnexpandedResults_ != false) {
+        size += com.google.protobuf.CodedOutputStream.computeBoolSize(2, pinUnexpandedResults_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -8881,6 +8927,7 @@ public boolean equals(final java.lang.Object obj) {
           (com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec) obj;
 
       if (condition_ != other.condition_) return false;
+      if (getPinUnexpandedResults() != other.getPinUnexpandedResults()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -8894,6 +8941,8 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + CONDITION_FIELD_NUMBER;
       hash = (53 * hash) + condition_;
+      hash = (37 * hash) + PIN_UNEXPANDED_RESULTS_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getPinUnexpandedResults());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -9045,6 +9094,8 @@ public Builder clear() {
         super.clear();
         condition_ = 0;
 
+        pinUnexpandedResults_ = false;
+
         return this;
       }
 
@@ -9074,6 +9125,7 @@ public com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec buildPartial(
         com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec result =
             new com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec(this);
         result.condition_ = condition_;
+        result.pinUnexpandedResults_ = pinUnexpandedResults_;
         onBuilt();
         return result;
       }
@@ -9130,6 +9182,9 @@ public Builder mergeFrom(com.google.cloud.retail.v2.SearchRequest.QueryExpansion
         if (other.condition_ != 0) {
           setConditionValue(other.getConditionValue());
         }
+        if (other.getPinUnexpandedResults() != false) {
+          setPinUnexpandedResults(other.getPinUnexpandedResults());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -9266,6 +9321,64 @@ public Builder clearCondition() {
         return this;
       }
 
+      private boolean pinUnexpandedResults_;
+      /**
+       *
+       *
+       * <pre>
+       * Whether to pin unexpanded results. If this field is set to true,
+       * unexpanded products are always at the top of the search results, followed
+       * by the expanded results.
+       * </pre>
+       *
+       * <code>bool pin_unexpanded_results = 2;</code>
+       *
+       * @return The pinUnexpandedResults.
+       */
+      @java.lang.Override
+      public boolean getPinUnexpandedResults() {
+        return pinUnexpandedResults_;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Whether to pin unexpanded results. If this field is set to true,
+       * unexpanded products are always at the top of the search results, followed
+       * by the expanded results.
+       * </pre>
+       *
+       * <code>bool pin_unexpanded_results = 2;</code>
+       *
+       * @param value The pinUnexpandedResults to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPinUnexpandedResults(boolean value) {
+
+        pinUnexpandedResults_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Whether to pin unexpanded results. If this field is set to true,
+       * unexpanded products are always at the top of the search results, followed
+       * by the expanded results.
+       * </pre>
+       *
+       * <code>bool pin_unexpanded_results = 2;</code>
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearPinUnexpandedResults() {
+
+        pinUnexpandedResults_ = false;
+        onChanged();
+        return this;
+      }
+
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
@@ -9704,7 +9817,8 @@ public int getOffset() {
    * <pre>
    * The filter syntax consists of an expression language for constructing a
    * predicate from one or more fields of the products being filtered. Filter
-   * expression is case-sensitive.
+   * expression is case-sensitive. See more details at this [user
+   * guide](/retail/private/docs/filter-and-order#filter).
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -9730,7 +9844,8 @@ public java.lang.String getFilter() {
    * <pre>
    * The filter syntax consists of an expression language for constructing a
    * predicate from one or more fields of the products being filtered. Filter
-   * expression is case-sensitive.
+   * expression is case-sensitive. See more details at this [user
+   * guide](/retail/private/docs/filter-and-order#filter).
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -9822,7 +9937,9 @@ public com.google.protobuf.ByteString getCanonicalFilterBytes() {
    * <pre>
    * The order in which products are returned. Products can be ordered by
    * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-   * unset if ordered by relevance. OrderBy expression is case-sensitive.
+   * unset if ordered by relevance. OrderBy expression is case-sensitive. See
+   * more details at this [user
+   * guide](/retail/private/docs/filter-and-order#order).
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -9848,7 +9965,9 @@ public java.lang.String getOrderBy() {
    * <pre>
    * The order in which products are returned. Products can be ordered by
    * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-   * unset if ordered by relevance. OrderBy expression is case-sensitive.
+   * unset if ordered by relevance. OrderBy expression is case-sensitive. See
+   * more details at this [user
+   * guide](/retail/private/docs/filter-and-order#order).
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -9957,9 +10076,8 @@ public com.google.cloud.retail.v2.SearchRequest.FacetSpecOrBuilder getFacetSpecs
    * <pre>
    * The specification for dynamically generated facets. Notice that only
    * textual facets can be dynamically generated.
-   * This feature requires additional allowlisting. Contact Retail Support
-   * (retail-search-support&#64;google.com) if you are interested in using dynamic
-   * facet feature.
+   * This feature requires additional allowlisting. Contact Retail Search
+   * support team if you are interested in using dynamic facet feature.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -9976,9 +10094,8 @@ public boolean hasDynamicFacetSpec() {
    * <pre>
    * The specification for dynamically generated facets. Notice that only
    * textual facets can be dynamically generated.
-   * This feature requires additional allowlisting. Contact Retail Support
-   * (retail-search-support&#64;google.com) if you are interested in using dynamic
-   * facet feature.
+   * This feature requires additional allowlisting. Contact Retail Search
+   * support team if you are interested in using dynamic facet feature.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -9997,9 +10114,8 @@ public com.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec getDynamicFacet
    * <pre>
    * The specification for dynamically generated facets. Notice that only
    * textual facets can be dynamically generated.
-   * This feature requires additional allowlisting. Contact Retail Support
-   * (retail-search-support&#64;google.com) if you are interested in using dynamic
-   * facet feature.
+   * This feature requires additional allowlisting. Contact Retail Search
+   * support team if you are interested in using dynamic facet feature.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -10016,7 +10132,8 @@ public com.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec getDynamicFacet
    *
    *
    * <pre>
-   * Boost specification to boost certain products.
+   * Boost specification to boost certain products. See more details at this
+   * [user guide](/retail/private/docs/boosting).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -10031,7 +10148,8 @@ public boolean hasBoostSpec() {
    *
    *
    * <pre>
-   * Boost specification to boost certain products.
+   * Boost specification to boost certain products. See more details at this
+   * [user guide](/retail/private/docs/boosting).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -10048,7 +10166,8 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpec getBoostSpec() {
    *
    *
    * <pre>
-   * Boost specification to boost certain products.
+   * Boost specification to boost certain products. See more details at this
+   * [user guide](/retail/private/docs/boosting).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -10065,7 +10184,8 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpecOrBuilder getBoostSpecO
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur.
+   * query expansion will occur. See more details at this [user
+   * guide](/retail/private/docs/result-size#query_expansion).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -10082,7 +10202,8 @@ public boolean hasQueryExpansionSpec() {
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur.
+   * query expansion will occur. See more details at this [user
+   * guide](/retail/private/docs/result-size#query_expansion).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -10101,7 +10222,8 @@ public com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec getQueryExpan
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur.
+   * query expansion will occur. See more details at this [user
+   * guide](/retail/private/docs/result-size#query_expansion).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -10127,10 +10249,9 @@ public com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec getQueryExpan
    * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
    * query latency. Maximum number of keys is 10.
-   * For
-   * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-   * a fulfillment type and a fulfillment ID must be provided in the format of
-   * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+   * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+   * fulfillment type and a fulfillment ID must be provided in the format of
+   * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
    * "pickupInStore" is fulfillment type and "store123" is the store ID.
    * Supported keys are:
    * * colorFamilies
@@ -10139,24 +10260,42 @@ public com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec getQueryExpan
    * * discount
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-   * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-   * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-   * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-   * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-   * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-   * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-   * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-   * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-   * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+   * * pickupInStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "pickup-in-store".
+   * * shipToStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "ship-to-store".
+   * * sameDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "same-day-delivery".
+   * * nextDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "next-day-delivery".
+   * * customFulfillment1.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-1".
+   * * customFulfillment2.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-2".
+   * * customFulfillment3.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-3".
+   * * customFulfillment4.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-4".
+   * * customFulfillment5.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-5".
    * If this field is set to an invalid value other than these, an
    * INVALID_ARGUMENT error is returned.
    * </pre>
@@ -10180,10 +10319,9 @@ public com.google.protobuf.ProtocolStringList getVariantRollupKeysList() {
    * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
    * query latency. Maximum number of keys is 10.
-   * For
-   * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-   * a fulfillment type and a fulfillment ID must be provided in the format of
-   * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+   * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+   * fulfillment type and a fulfillment ID must be provided in the format of
+   * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
    * "pickupInStore" is fulfillment type and "store123" is the store ID.
    * Supported keys are:
    * * colorFamilies
@@ -10192,24 +10330,42 @@ public com.google.protobuf.ProtocolStringList getVariantRollupKeysList() {
    * * discount
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-   * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-   * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-   * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-   * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-   * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-   * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-   * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-   * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-   * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+   * * pickupInStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "pickup-in-store".
+   * * shipToStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "ship-to-store".
+   * * sameDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "same-day-delivery".
+   * * nextDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "next-day-delivery".
+   * * customFulfillment1.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-1".
+   * * customFulfillment2.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-2".
+   * * customFulfillment3.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-3".
+   * * customFulfillment4.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-4".
+   * * customFulfillment5.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-5".
    * If this field is set to an invalid value other than these, an
    * INVALID_ARGUMENT error is returned.
    * </pre>
@@ -10233,10 +10389,9 @@ public int getVariantRollupKeysCount() {
    * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
    * query latency. Maximum number of keys is 10.
-   * For
-   * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-   * a fulfillment type and a fulfillment ID must be provided in the format of
-   * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+   * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+   * fulfillment type and a fulfillment ID must be provided in the format of
+   * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
    * "pickupInStore" is fulfillment type and "store123" is the store ID.
    * Supported keys are:
    * * colorFamilies
@@ -10245,24 +10400,42 @@ public int getVariantRollupKeysCount() {
    * * discount
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-   * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-   * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-   * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-   * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-   * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-   * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-   * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-   * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-   * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+   * * pickupInStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "pickup-in-store".
+   * * shipToStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "ship-to-store".
+   * * sameDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "same-day-delivery".
+   * * nextDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "next-day-delivery".
+   * * customFulfillment1.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-1".
+   * * customFulfillment2.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-2".
+   * * customFulfillment3.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-3".
+   * * customFulfillment4.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-4".
+   * * customFulfillment5.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-5".
    * If this field is set to an invalid value other than these, an
    * INVALID_ARGUMENT error is returned.
    * </pre>
@@ -10287,10 +10460,9 @@ public java.lang.String getVariantRollupKeys(int index) {
    * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
    * query latency. Maximum number of keys is 10.
-   * For
-   * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-   * a fulfillment type and a fulfillment ID must be provided in the format of
-   * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+   * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+   * fulfillment type and a fulfillment ID must be provided in the format of
+   * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
    * "pickupInStore" is fulfillment type and "store123" is the store ID.
    * Supported keys are:
    * * colorFamilies
@@ -10299,24 +10471,42 @@ public java.lang.String getVariantRollupKeys(int index) {
    * * discount
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-   * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-   * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-   * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-   * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-   * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-   * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-   * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-   * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-   * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+   * * pickupInStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "pickup-in-store".
+   * * shipToStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "ship-to-store".
+   * * sameDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "same-day-delivery".
+   * * nextDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "next-day-delivery".
+   * * customFulfillment1.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-1".
+   * * customFulfillment2.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-2".
+   * * customFulfillment3.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-3".
+   * * customFulfillment4.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-4".
+   * * customFulfillment5.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-5".
    * If this field is set to an invalid value other than these, an
    * INVALID_ARGUMENT error is returned.
    * </pre>
@@ -12076,7 +12266,8 @@ public Builder clearOffset() {
      * <pre>
      * The filter syntax consists of an expression language for constructing a
      * predicate from one or more fields of the products being filtered. Filter
-     * expression is case-sensitive.
+     * expression is case-sensitive. See more details at this [user
+     * guide](/retail/private/docs/filter-and-order#filter).
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12101,7 +12292,8 @@ public java.lang.String getFilter() {
      * <pre>
      * The filter syntax consists of an expression language for constructing a
      * predicate from one or more fields of the products being filtered. Filter
-     * expression is case-sensitive.
+     * expression is case-sensitive. See more details at this [user
+     * guide](/retail/private/docs/filter-and-order#filter).
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12126,7 +12318,8 @@ public com.google.protobuf.ByteString getFilterBytes() {
      * <pre>
      * The filter syntax consists of an expression language for constructing a
      * predicate from one or more fields of the products being filtered. Filter
-     * expression is case-sensitive.
+     * expression is case-sensitive. See more details at this [user
+     * guide](/retail/private/docs/filter-and-order#filter).
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12150,7 +12343,8 @@ public Builder setFilter(java.lang.String value) {
      * <pre>
      * The filter syntax consists of an expression language for constructing a
      * predicate from one or more fields of the products being filtered. Filter
-     * expression is case-sensitive.
+     * expression is case-sensitive. See more details at this [user
+     * guide](/retail/private/docs/filter-and-order#filter).
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12170,7 +12364,8 @@ public Builder clearFilter() {
      * <pre>
      * The filter syntax consists of an expression language for constructing a
      * predicate from one or more fields of the products being filtered. Filter
-     * expression is case-sensitive.
+     * expression is case-sensitive. See more details at this [user
+     * guide](/retail/private/docs/filter-and-order#filter).
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12338,7 +12533,9 @@ public Builder setCanonicalFilterBytes(com.google.protobuf.ByteString value) {
      * <pre>
      * The order in which products are returned. Products can be ordered by
      * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-     * unset if ordered by relevance. OrderBy expression is case-sensitive.
+     * unset if ordered by relevance. OrderBy expression is case-sensitive. See
+     * more details at this [user
+     * guide](/retail/private/docs/filter-and-order#order).
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12363,7 +12560,9 @@ public java.lang.String getOrderBy() {
      * <pre>
      * The order in which products are returned. Products can be ordered by
      * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-     * unset if ordered by relevance. OrderBy expression is case-sensitive.
+     * unset if ordered by relevance. OrderBy expression is case-sensitive. See
+     * more details at this [user
+     * guide](/retail/private/docs/filter-and-order#order).
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12388,7 +12587,9 @@ public com.google.protobuf.ByteString getOrderByBytes() {
      * <pre>
      * The order in which products are returned. Products can be ordered by
      * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-     * unset if ordered by relevance. OrderBy expression is case-sensitive.
+     * unset if ordered by relevance. OrderBy expression is case-sensitive. See
+     * more details at this [user
+     * guide](/retail/private/docs/filter-and-order#order).
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12412,7 +12613,9 @@ public Builder setOrderBy(java.lang.String value) {
      * <pre>
      * The order in which products are returned. Products can be ordered by
      * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-     * unset if ordered by relevance. OrderBy expression is case-sensitive.
+     * unset if ordered by relevance. OrderBy expression is case-sensitive. See
+     * more details at this [user
+     * guide](/retail/private/docs/filter-and-order#order).
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12432,7 +12635,9 @@ public Builder clearOrderBy() {
      * <pre>
      * The order in which products are returned. Products can be ordered by
      * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-     * unset if ordered by relevance. OrderBy expression is case-sensitive.
+     * unset if ordered by relevance. OrderBy expression is case-sensitive. See
+     * more details at this [user
+     * guide](/retail/private/docs/filter-and-order#order).
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12858,9 +13063,8 @@ public com.google.cloud.retail.v2.SearchRequest.FacetSpec.Builder addFacetSpecsB
      * <pre>
      * The specification for dynamically generated facets. Notice that only
      * textual facets can be dynamically generated.
-     * This feature requires additional allowlisting. Contact Retail Support
-     * (retail-search-support&#64;google.com) if you are interested in using dynamic
-     * facet feature.
+     * This feature requires additional allowlisting. Contact Retail Search
+     * support team if you are interested in using dynamic facet feature.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -12876,9 +13080,8 @@ public boolean hasDynamicFacetSpec() {
      * <pre>
      * The specification for dynamically generated facets. Notice that only
      * textual facets can be dynamically generated.
-     * This feature requires additional allowlisting. Contact Retail Support
-     * (retail-search-support&#64;google.com) if you are interested in using dynamic
-     * facet feature.
+     * This feature requires additional allowlisting. Contact Retail Search
+     * support team if you are interested in using dynamic facet feature.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -12900,9 +13103,8 @@ public com.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec getDynamicFacet
      * <pre>
      * The specification for dynamically generated facets. Notice that only
      * textual facets can be dynamically generated.
-     * This feature requires additional allowlisting. Contact Retail Support
-     * (retail-search-support&#64;google.com) if you are interested in using dynamic
-     * facet feature.
+     * This feature requires additional allowlisting. Contact Retail Search
+     * support team if you are interested in using dynamic facet feature.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -12927,9 +13129,8 @@ public Builder setDynamicFacetSpec(
      * <pre>
      * The specification for dynamically generated facets. Notice that only
      * textual facets can be dynamically generated.
-     * This feature requires additional allowlisting. Contact Retail Support
-     * (retail-search-support&#64;google.com) if you are interested in using dynamic
-     * facet feature.
+     * This feature requires additional allowlisting. Contact Retail Search
+     * support team if you are interested in using dynamic facet feature.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -12951,9 +13152,8 @@ public Builder setDynamicFacetSpec(
      * <pre>
      * The specification for dynamically generated facets. Notice that only
      * textual facets can be dynamically generated.
-     * This feature requires additional allowlisting. Contact Retail Support
-     * (retail-search-support&#64;google.com) if you are interested in using dynamic
-     * facet feature.
+     * This feature requires additional allowlisting. Contact Retail Search
+     * support team if you are interested in using dynamic facet feature.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -12983,9 +13183,8 @@ public Builder mergeDynamicFacetSpec(
      * <pre>
      * The specification for dynamically generated facets. Notice that only
      * textual facets can be dynamically generated.
-     * This feature requires additional allowlisting. Contact Retail Support
-     * (retail-search-support&#64;google.com) if you are interested in using dynamic
-     * facet feature.
+     * This feature requires additional allowlisting. Contact Retail Search
+     * support team if you are interested in using dynamic facet feature.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -13007,9 +13206,8 @@ public Builder clearDynamicFacetSpec() {
      * <pre>
      * The specification for dynamically generated facets. Notice that only
      * textual facets can be dynamically generated.
-     * This feature requires additional allowlisting. Contact Retail Support
-     * (retail-search-support&#64;google.com) if you are interested in using dynamic
-     * facet feature.
+     * This feature requires additional allowlisting. Contact Retail Search
+     * support team if you are interested in using dynamic facet feature.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -13026,9 +13224,8 @@ public Builder clearDynamicFacetSpec() {
      * <pre>
      * The specification for dynamically generated facets. Notice that only
      * textual facets can be dynamically generated.
-     * This feature requires additional allowlisting. Contact Retail Support
-     * (retail-search-support&#64;google.com) if you are interested in using dynamic
-     * facet feature.
+     * This feature requires additional allowlisting. Contact Retail Search
+     * support team if you are interested in using dynamic facet feature.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -13049,9 +13246,8 @@ public Builder clearDynamicFacetSpec() {
      * <pre>
      * The specification for dynamically generated facets. Notice that only
      * textual facets can be dynamically generated.
-     * This feature requires additional allowlisting. Contact Retail Support
-     * (retail-search-support&#64;google.com) if you are interested in using dynamic
-     * facet feature.
+     * This feature requires additional allowlisting. Contact Retail Search
+     * support team if you are interested in using dynamic facet feature.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -13083,7 +13279,8 @@ public Builder clearDynamicFacetSpec() {
      *
      *
      * <pre>
-     * Boost specification to boost certain products.
+     * Boost specification to boost certain products. See more details at this
+     * [user guide](/retail/private/docs/boosting).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13097,7 +13294,8 @@ public boolean hasBoostSpec() {
      *
      *
      * <pre>
-     * Boost specification to boost certain products.
+     * Boost specification to boost certain products. See more details at this
+     * [user guide](/retail/private/docs/boosting).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13117,7 +13315,8 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpec getBoostSpec() {
      *
      *
      * <pre>
-     * Boost specification to boost certain products.
+     * Boost specification to boost certain products. See more details at this
+     * [user guide](/retail/private/docs/boosting).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13139,7 +13338,8 @@ public Builder setBoostSpec(com.google.cloud.retail.v2.SearchRequest.BoostSpec v
      *
      *
      * <pre>
-     * Boost specification to boost certain products.
+     * Boost specification to boost certain products. See more details at this
+     * [user guide](/retail/private/docs/boosting).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13159,7 +13359,8 @@ public Builder setBoostSpec(
      *
      *
      * <pre>
-     * Boost specification to boost certain products.
+     * Boost specification to boost certain products. See more details at this
+     * [user guide](/retail/private/docs/boosting).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13185,7 +13386,8 @@ public Builder mergeBoostSpec(com.google.cloud.retail.v2.SearchRequest.BoostSpec
      *
      *
      * <pre>
-     * Boost specification to boost certain products.
+     * Boost specification to boost certain products. See more details at this
+     * [user guide](/retail/private/docs/boosting).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13205,7 +13407,8 @@ public Builder clearBoostSpec() {
      *
      *
      * <pre>
-     * Boost specification to boost certain products.
+     * Boost specification to boost certain products. See more details at this
+     * [user guide](/retail/private/docs/boosting).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13219,7 +13422,8 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpec.Builder getBoostSpecBu
      *
      *
      * <pre>
-     * Boost specification to boost certain products.
+     * Boost specification to boost certain products. See more details at this
+     * [user guide](/retail/private/docs/boosting).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13237,7 +13441,8 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpecOrBuilder getBoostSpecO
      *
      *
      * <pre>
-     * Boost specification to boost certain products.
+     * Boost specification to boost certain products. See more details at this
+     * [user guide](/retail/private/docs/boosting).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13270,7 +13475,8 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpecOrBuilder getBoostSpecO
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur.
+     * query expansion will occur. See more details at this [user
+     * guide](/retail/private/docs/result-size#query_expansion).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13286,7 +13492,8 @@ public boolean hasQueryExpansionSpec() {
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur.
+     * query expansion will occur. See more details at this [user
+     * guide](/retail/private/docs/result-size#query_expansion).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13308,7 +13515,8 @@ public com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec getQueryExpan
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur.
+     * query expansion will occur. See more details at this [user
+     * guide](/retail/private/docs/result-size#query_expansion).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13333,7 +13541,8 @@ public Builder setQueryExpansionSpec(
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur.
+     * query expansion will occur. See more details at this [user
+     * guide](/retail/private/docs/result-size#query_expansion).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13355,7 +13564,8 @@ public Builder setQueryExpansionSpec(
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur.
+     * query expansion will occur. See more details at this [user
+     * guide](/retail/private/docs/result-size#query_expansion).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13385,7 +13595,8 @@ public Builder mergeQueryExpansionSpec(
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur.
+     * query expansion will occur. See more details at this [user
+     * guide](/retail/private/docs/result-size#query_expansion).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13407,7 +13618,8 @@ public Builder clearQueryExpansionSpec() {
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur.
+     * query expansion will occur. See more details at this [user
+     * guide](/retail/private/docs/result-size#query_expansion).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13424,7 +13636,8 @@ public Builder clearQueryExpansionSpec() {
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur.
+     * query expansion will occur. See more details at this [user
+     * guide](/retail/private/docs/result-size#query_expansion).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13445,7 +13658,8 @@ public Builder clearQueryExpansionSpec() {
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur.
+     * query expansion will occur. See more details at this [user
+     * guide](/retail/private/docs/result-size#query_expansion).
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13489,10 +13703,9 @@ private void ensureVariantRollupKeysIsMutable() {
      * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
      * query latency. Maximum number of keys is 10.
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * a fulfillment type and a fulfillment ID must be provided in the format of
-     * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+     * fulfillment type and a fulfillment ID must be provided in the format of
+     * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
      * "pickupInStore" is fulfillment type and "store123" is the store ID.
      * Supported keys are:
      * * colorFamilies
@@ -13501,24 +13714,42 @@ private void ensureVariantRollupKeysIsMutable() {
      * * discount
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-     * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-     * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-     * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-     * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-     * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-     * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-     * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-     * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-     * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+     * * pickupInStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "pickup-in-store".
+     * * shipToStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "ship-to-store".
+     * * sameDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "same-day-delivery".
+     * * nextDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "next-day-delivery".
+     * * customFulfillment1.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-1".
+     * * customFulfillment2.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-2".
+     * * customFulfillment3.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-3".
+     * * customFulfillment4.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-4".
+     * * customFulfillment5.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-5".
      * If this field is set to an invalid value other than these, an
      * INVALID_ARGUMENT error is returned.
      * </pre>
@@ -13542,10 +13773,9 @@ public com.google.protobuf.ProtocolStringList getVariantRollupKeysList() {
      * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
      * query latency. Maximum number of keys is 10.
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * a fulfillment type and a fulfillment ID must be provided in the format of
-     * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+     * fulfillment type and a fulfillment ID must be provided in the format of
+     * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
      * "pickupInStore" is fulfillment type and "store123" is the store ID.
      * Supported keys are:
      * * colorFamilies
@@ -13554,24 +13784,42 @@ public com.google.protobuf.ProtocolStringList getVariantRollupKeysList() {
      * * discount
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-     * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-     * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-     * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-     * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-     * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-     * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-     * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-     * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-     * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+     * * pickupInStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "pickup-in-store".
+     * * shipToStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "ship-to-store".
+     * * sameDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "same-day-delivery".
+     * * nextDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "next-day-delivery".
+     * * customFulfillment1.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-1".
+     * * customFulfillment2.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-2".
+     * * customFulfillment3.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-3".
+     * * customFulfillment4.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-4".
+     * * customFulfillment5.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-5".
      * If this field is set to an invalid value other than these, an
      * INVALID_ARGUMENT error is returned.
      * </pre>
@@ -13595,10 +13843,9 @@ public int getVariantRollupKeysCount() {
      * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
      * query latency. Maximum number of keys is 10.
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * a fulfillment type and a fulfillment ID must be provided in the format of
-     * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+     * fulfillment type and a fulfillment ID must be provided in the format of
+     * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
      * "pickupInStore" is fulfillment type and "store123" is the store ID.
      * Supported keys are:
      * * colorFamilies
@@ -13607,24 +13854,42 @@ public int getVariantRollupKeysCount() {
      * * discount
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-     * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-     * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-     * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-     * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-     * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-     * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-     * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-     * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-     * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+     * * pickupInStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "pickup-in-store".
+     * * shipToStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "ship-to-store".
+     * * sameDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "same-day-delivery".
+     * * nextDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "next-day-delivery".
+     * * customFulfillment1.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-1".
+     * * customFulfillment2.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-2".
+     * * customFulfillment3.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-3".
+     * * customFulfillment4.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-4".
+     * * customFulfillment5.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-5".
      * If this field is set to an invalid value other than these, an
      * INVALID_ARGUMENT error is returned.
      * </pre>
@@ -13649,10 +13914,9 @@ public java.lang.String getVariantRollupKeys(int index) {
      * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
      * query latency. Maximum number of keys is 10.
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * a fulfillment type and a fulfillment ID must be provided in the format of
-     * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+     * fulfillment type and a fulfillment ID must be provided in the format of
+     * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
      * "pickupInStore" is fulfillment type and "store123" is the store ID.
      * Supported keys are:
      * * colorFamilies
@@ -13661,24 +13925,42 @@ public java.lang.String getVariantRollupKeys(int index) {
      * * discount
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-     * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-     * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-     * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-     * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-     * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-     * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-     * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-     * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-     * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+     * * pickupInStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "pickup-in-store".
+     * * shipToStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "ship-to-store".
+     * * sameDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "same-day-delivery".
+     * * nextDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "next-day-delivery".
+     * * customFulfillment1.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-1".
+     * * customFulfillment2.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-2".
+     * * customFulfillment3.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-3".
+     * * customFulfillment4.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-4".
+     * * customFulfillment5.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-5".
      * If this field is set to an invalid value other than these, an
      * INVALID_ARGUMENT error is returned.
      * </pre>
@@ -13703,10 +13985,9 @@ public com.google.protobuf.ByteString getVariantRollupKeysBytes(int index) {
      * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
      * query latency. Maximum number of keys is 10.
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * a fulfillment type and a fulfillment ID must be provided in the format of
-     * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+     * fulfillment type and a fulfillment ID must be provided in the format of
+     * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
      * "pickupInStore" is fulfillment type and "store123" is the store ID.
      * Supported keys are:
      * * colorFamilies
@@ -13715,24 +13996,42 @@ public com.google.protobuf.ByteString getVariantRollupKeysBytes(int index) {
      * * discount
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-     * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-     * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-     * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-     * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-     * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-     * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-     * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-     * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-     * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+     * * pickupInStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "pickup-in-store".
+     * * shipToStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "ship-to-store".
+     * * sameDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "same-day-delivery".
+     * * nextDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "next-day-delivery".
+     * * customFulfillment1.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-1".
+     * * customFulfillment2.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-2".
+     * * customFulfillment3.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-3".
+     * * customFulfillment4.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-4".
+     * * customFulfillment5.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-5".
      * If this field is set to an invalid value other than these, an
      * INVALID_ARGUMENT error is returned.
      * </pre>
@@ -13764,10 +14063,9 @@ public Builder setVariantRollupKeys(int index, java.lang.String value) {
      * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
      * query latency. Maximum number of keys is 10.
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * a fulfillment type and a fulfillment ID must be provided in the format of
-     * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+     * fulfillment type and a fulfillment ID must be provided in the format of
+     * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
      * "pickupInStore" is fulfillment type and "store123" is the store ID.
      * Supported keys are:
      * * colorFamilies
@@ -13776,24 +14074,42 @@ public Builder setVariantRollupKeys(int index, java.lang.String value) {
      * * discount
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-     * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-     * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-     * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-     * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-     * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-     * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-     * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-     * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-     * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+     * * pickupInStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "pickup-in-store".
+     * * shipToStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "ship-to-store".
+     * * sameDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "same-day-delivery".
+     * * nextDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "next-day-delivery".
+     * * customFulfillment1.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-1".
+     * * customFulfillment2.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-2".
+     * * customFulfillment3.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-3".
+     * * customFulfillment4.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-4".
+     * * customFulfillment5.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-5".
      * If this field is set to an invalid value other than these, an
      * INVALID_ARGUMENT error is returned.
      * </pre>
@@ -13824,10 +14140,9 @@ public Builder addVariantRollupKeys(java.lang.String value) {
      * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
      * query latency. Maximum number of keys is 10.
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * a fulfillment type and a fulfillment ID must be provided in the format of
-     * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+     * fulfillment type and a fulfillment ID must be provided in the format of
+     * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
      * "pickupInStore" is fulfillment type and "store123" is the store ID.
      * Supported keys are:
      * * colorFamilies
@@ -13836,24 +14151,42 @@ public Builder addVariantRollupKeys(java.lang.String value) {
      * * discount
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-     * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-     * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-     * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-     * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-     * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-     * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-     * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-     * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-     * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+     * * pickupInStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "pickup-in-store".
+     * * shipToStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "ship-to-store".
+     * * sameDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "same-day-delivery".
+     * * nextDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "next-day-delivery".
+     * * customFulfillment1.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-1".
+     * * customFulfillment2.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-2".
+     * * customFulfillment3.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-3".
+     * * customFulfillment4.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-4".
+     * * customFulfillment5.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-5".
      * If this field is set to an invalid value other than these, an
      * INVALID_ARGUMENT error is returned.
      * </pre>
@@ -13881,10 +14214,9 @@ public Builder addAllVariantRollupKeys(java.lang.Iterable<java.lang.String> valu
      * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
      * query latency. Maximum number of keys is 10.
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * a fulfillment type and a fulfillment ID must be provided in the format of
-     * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+     * fulfillment type and a fulfillment ID must be provided in the format of
+     * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
      * "pickupInStore" is fulfillment type and "store123" is the store ID.
      * Supported keys are:
      * * colorFamilies
@@ -13893,24 +14225,42 @@ public Builder addAllVariantRollupKeys(java.lang.Iterable<java.lang.String> valu
      * * discount
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-     * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-     * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-     * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-     * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-     * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-     * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-     * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-     * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-     * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+     * * pickupInStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "pickup-in-store".
+     * * shipToStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "ship-to-store".
+     * * sameDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "same-day-delivery".
+     * * nextDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "next-day-delivery".
+     * * customFulfillment1.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-1".
+     * * customFulfillment2.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-2".
+     * * customFulfillment3.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-3".
+     * * customFulfillment4.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-4".
+     * * customFulfillment5.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-5".
      * If this field is set to an invalid value other than these, an
      * INVALID_ARGUMENT error is returned.
      * </pre>
@@ -13937,10 +14287,9 @@ public Builder clearVariantRollupKeys() {
      * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
      * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
      * query latency. Maximum number of keys is 10.
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * a fulfillment type and a fulfillment ID must be provided in the format of
-     * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+     * fulfillment type and a fulfillment ID must be provided in the format of
+     * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
      * "pickupInStore" is fulfillment type and "store123" is the store ID.
      * Supported keys are:
      * * colorFamilies
@@ -13949,24 +14298,42 @@ public Builder clearVariantRollupKeys() {
      * * discount
      * * attributes.key, where key is any key in the
      *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-     * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-     * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-     * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-     * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-     * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-     * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-     * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-     * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-     * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-     *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+     * * pickupInStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "pickup-in-store".
+     * * shipToStore.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "ship-to-store".
+     * * sameDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "same-day-delivery".
+     * * nextDayDelivery.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "next-day-delivery".
+     * * customFulfillment1.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-1".
+     * * customFulfillment2.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-2".
+     * * customFulfillment3.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-3".
+     * * customFulfillment4.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-4".
+     * * customFulfillment5.id, where id is any
+     * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+     * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+     *   "custom-type-5".
      * If this field is set to an invalid value other than these, an
      * INVALID_ARGUMENT error is returned.
      * </pre>
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java
index f4deeea9..c227b66e 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java
@@ -265,7 +265,8 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The filter syntax consists of an expression language for constructing a
    * predicate from one or more fields of the products being filtered. Filter
-   * expression is case-sensitive.
+   * expression is case-sensitive. See more details at this [user
+   * guide](/retail/private/docs/filter-and-order#filter).
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -280,7 +281,8 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The filter syntax consists of an expression language for constructing a
    * predicate from one or more fields of the products being filtered. Filter
-   * expression is case-sensitive.
+   * expression is case-sensitive. See more details at this [user
+   * guide](/retail/private/docs/filter-and-order#filter).
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -335,7 +337,9 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The order in which products are returned. Products can be ordered by
    * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-   * unset if ordered by relevance. OrderBy expression is case-sensitive.
+   * unset if ordered by relevance. OrderBy expression is case-sensitive. See
+   * more details at this [user
+   * guide](/retail/private/docs/filter-and-order#order).
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -350,7 +354,9 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The order in which products are returned. Products can be ordered by
    * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-   * unset if ordered by relevance. OrderBy expression is case-sensitive.
+   * unset if ordered by relevance. OrderBy expression is case-sensitive. See
+   * more details at this [user
+   * guide](/retail/private/docs/filter-and-order#order).
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -428,9 +434,8 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The specification for dynamically generated facets. Notice that only
    * textual facets can be dynamically generated.
-   * This feature requires additional allowlisting. Contact Retail Support
-   * (retail-search-support&#64;google.com) if you are interested in using dynamic
-   * facet feature.
+   * This feature requires additional allowlisting. Contact Retail Search
+   * support team if you are interested in using dynamic facet feature.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -444,9 +449,8 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The specification for dynamically generated facets. Notice that only
    * textual facets can be dynamically generated.
-   * This feature requires additional allowlisting. Contact Retail Support
-   * (retail-search-support&#64;google.com) if you are interested in using dynamic
-   * facet feature.
+   * This feature requires additional allowlisting. Contact Retail Search
+   * support team if you are interested in using dynamic facet feature.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -460,9 +464,8 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The specification for dynamically generated facets. Notice that only
    * textual facets can be dynamically generated.
-   * This feature requires additional allowlisting. Contact Retail Support
-   * (retail-search-support&#64;google.com) if you are interested in using dynamic
-   * facet feature.
+   * This feature requires additional allowlisting. Contact Retail Search
+   * support team if you are interested in using dynamic facet feature.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec dynamic_facet_spec = 21;</code>
@@ -473,7 +476,8 @@ public interface SearchRequestOrBuilder
    *
    *
    * <pre>
-   * Boost specification to boost certain products.
+   * Boost specification to boost certain products. See more details at this
+   * [user guide](/retail/private/docs/boosting).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -485,7 +489,8 @@ public interface SearchRequestOrBuilder
    *
    *
    * <pre>
-   * Boost specification to boost certain products.
+   * Boost specification to boost certain products. See more details at this
+   * [user guide](/retail/private/docs/boosting).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -497,7 +502,8 @@ public interface SearchRequestOrBuilder
    *
    *
    * <pre>
-   * Boost specification to boost certain products.
+   * Boost specification to boost certain products. See more details at this
+   * [user guide](/retail/private/docs/boosting).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -509,7 +515,8 @@ public interface SearchRequestOrBuilder
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur.
+   * query expansion will occur. See more details at this [user
+   * guide](/retail/private/docs/result-size#query_expansion).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -523,7 +530,8 @@ public interface SearchRequestOrBuilder
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur.
+   * query expansion will occur. See more details at this [user
+   * guide](/retail/private/docs/result-size#query_expansion).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -537,7 +545,8 @@ public interface SearchRequestOrBuilder
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur.
+   * query expansion will occur. See more details at this [user
+   * guide](/retail/private/docs/result-size#query_expansion).
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -558,10 +567,9 @@ public interface SearchRequestOrBuilder
    * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
    * query latency. Maximum number of keys is 10.
-   * For
-   * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-   * a fulfillment type and a fulfillment ID must be provided in the format of
-   * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+   * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+   * fulfillment type and a fulfillment ID must be provided in the format of
+   * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
    * "pickupInStore" is fulfillment type and "store123" is the store ID.
    * Supported keys are:
    * * colorFamilies
@@ -570,24 +578,42 @@ public interface SearchRequestOrBuilder
    * * discount
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-   * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-   * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-   * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-   * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-   * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-   * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-   * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-   * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-   * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+   * * pickupInStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "pickup-in-store".
+   * * shipToStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "ship-to-store".
+   * * sameDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "same-day-delivery".
+   * * nextDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "next-day-delivery".
+   * * customFulfillment1.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-1".
+   * * customFulfillment2.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-2".
+   * * customFulfillment3.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-3".
+   * * customFulfillment4.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-4".
+   * * customFulfillment5.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-5".
    * If this field is set to an invalid value other than these, an
    * INVALID_ARGUMENT error is returned.
    * </pre>
@@ -609,10 +635,9 @@ public interface SearchRequestOrBuilder
    * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
    * query latency. Maximum number of keys is 10.
-   * For
-   * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-   * a fulfillment type and a fulfillment ID must be provided in the format of
-   * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+   * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+   * fulfillment type and a fulfillment ID must be provided in the format of
+   * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
    * "pickupInStore" is fulfillment type and "store123" is the store ID.
    * Supported keys are:
    * * colorFamilies
@@ -621,24 +646,42 @@ public interface SearchRequestOrBuilder
    * * discount
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-   * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-   * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-   * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-   * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-   * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-   * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-   * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-   * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-   * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+   * * pickupInStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "pickup-in-store".
+   * * shipToStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "ship-to-store".
+   * * sameDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "same-day-delivery".
+   * * nextDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "next-day-delivery".
+   * * customFulfillment1.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-1".
+   * * customFulfillment2.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-2".
+   * * customFulfillment3.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-3".
+   * * customFulfillment4.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-4".
+   * * customFulfillment5.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-5".
    * If this field is set to an invalid value other than these, an
    * INVALID_ARGUMENT error is returned.
    * </pre>
@@ -660,10 +703,9 @@ public interface SearchRequestOrBuilder
    * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
    * query latency. Maximum number of keys is 10.
-   * For
-   * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-   * a fulfillment type and a fulfillment ID must be provided in the format of
-   * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+   * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+   * fulfillment type and a fulfillment ID must be provided in the format of
+   * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
    * "pickupInStore" is fulfillment type and "store123" is the store ID.
    * Supported keys are:
    * * colorFamilies
@@ -672,24 +714,42 @@ public interface SearchRequestOrBuilder
    * * discount
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-   * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-   * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-   * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-   * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-   * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-   * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-   * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-   * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-   * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+   * * pickupInStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "pickup-in-store".
+   * * shipToStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "ship-to-store".
+   * * sameDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "same-day-delivery".
+   * * nextDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "next-day-delivery".
+   * * customFulfillment1.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-1".
+   * * customFulfillment2.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-2".
+   * * customFulfillment3.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-3".
+   * * customFulfillment4.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-4".
+   * * customFulfillment5.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-5".
    * If this field is set to an invalid value other than these, an
    * INVALID_ARGUMENT error is returned.
    * </pre>
@@ -712,10 +772,9 @@ public interface SearchRequestOrBuilder
    * Notice that rollup [variant][google.cloud.retail.v2.Product.Type.VARIANT]
    * [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
    * query latency. Maximum number of keys is 10.
-   * For
-   * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-   * a fulfillment type and a fulfillment ID must be provided in the format of
-   * "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+   * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+   * fulfillment type and a fulfillment ID must be provided in the format of
+   * "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
    * "pickupInStore" is fulfillment type and "store123" is the store ID.
    * Supported keys are:
    * * colorFamilies
@@ -724,24 +783,42 @@ public interface SearchRequestOrBuilder
    * * discount
    * * attributes.key, where key is any key in the
    *   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-   * * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-   * * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-   * * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-   * * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-   * * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-   * * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-   * * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-   * * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-   * * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-   *   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+   * * pickupInStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "pickup-in-store".
+   * * shipToStore.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "ship-to-store".
+   * * sameDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "same-day-delivery".
+   * * nextDayDelivery.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "next-day-delivery".
+   * * customFulfillment1.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-1".
+   * * customFulfillment2.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-2".
+   * * customFulfillment3.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-3".
+   * * customFulfillment4.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-4".
+   * * customFulfillment5.id, where id is any
+   * [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+   * for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+   *   "custom-type-5".
    * If this field is set to an invalid value other than these, an
    * INVALID_ARGUMENT error is returned.
    * </pre>
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchResponse.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchResponse.java
index 4b07a3a0..7d907da9 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchResponse.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchResponse.java
@@ -436,10 +436,9 @@ com.google.protobuf.FieldMask getMatchingVariantFieldsOrDefault(
      *          }
      *       }
      *     }
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * the rollup values is a double value with type
-     * [google.protobuf.Value][google.protobuf.Value]. For example:
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+     * values is a double value with type
+     * [google.protobuf.Value][google.protobuf.Value]. For example,
      * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
      * are 10 variants in this product are available in the store "store1".
      * </pre>
@@ -474,10 +473,9 @@ com.google.protobuf.FieldMask getMatchingVariantFieldsOrDefault(
      *          }
      *       }
      *     }
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * the rollup values is a double value with type
-     * [google.protobuf.Value][google.protobuf.Value]. For example:
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+     * values is a double value with type
+     * [google.protobuf.Value][google.protobuf.Value]. For example,
      * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
      * are 10 variants in this product are available in the store "store1".
      * </pre>
@@ -515,10 +513,9 @@ com.google.protobuf.FieldMask getMatchingVariantFieldsOrDefault(
      *          }
      *       }
      *     }
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * the rollup values is a double value with type
-     * [google.protobuf.Value][google.protobuf.Value]. For example:
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+     * values is a double value with type
+     * [google.protobuf.Value][google.protobuf.Value]. For example,
      * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
      * are 10 variants in this product are available in the store "store1".
      * </pre>
@@ -553,10 +550,9 @@ com.google.protobuf.FieldMask getMatchingVariantFieldsOrDefault(
      *          }
      *       }
      *     }
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * the rollup values is a double value with type
-     * [google.protobuf.Value][google.protobuf.Value]. For example:
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+     * values is a double value with type
+     * [google.protobuf.Value][google.protobuf.Value]. For example,
      * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
      * are 10 variants in this product are available in the store "store1".
      * </pre>
@@ -592,10 +588,9 @@ com.google.protobuf.Value getVariantRollupValuesOrDefault(
      *          }
      *       }
      *     }
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * the rollup values is a double value with type
-     * [google.protobuf.Value][google.protobuf.Value]. For example:
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+     * values is a double value with type
+     * [google.protobuf.Value][google.protobuf.Value]. For example,
      * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
      * are 10 variants in this product are available in the store "store1".
      * </pre>
@@ -1119,10 +1114,9 @@ public int getVariantRollupValuesCount() {
      *          }
      *       }
      *     }
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * the rollup values is a double value with type
-     * [google.protobuf.Value][google.protobuf.Value]. For example:
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+     * values is a double value with type
+     * [google.protobuf.Value][google.protobuf.Value]. For example,
      * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
      * are 10 variants in this product are available in the store "store1".
      * </pre>
@@ -1169,10 +1163,9 @@ public java.util.Map<java.lang.String, com.google.protobuf.Value> getVariantRoll
      *          }
      *       }
      *     }
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * the rollup values is a double value with type
-     * [google.protobuf.Value][google.protobuf.Value]. For example:
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+     * values is a double value with type
+     * [google.protobuf.Value][google.protobuf.Value]. For example,
      * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
      * are 10 variants in this product are available in the store "store1".
      * </pre>
@@ -1210,10 +1203,9 @@ public java.util.Map<java.lang.String, com.google.protobuf.Value> getVariantRoll
      *          }
      *       }
      *     }
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * the rollup values is a double value with type
-     * [google.protobuf.Value][google.protobuf.Value]. For example:
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+     * values is a double value with type
+     * [google.protobuf.Value][google.protobuf.Value]. For example,
      * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
      * are 10 variants in this product are available in the store "store1".
      * </pre>
@@ -1257,10 +1249,9 @@ public com.google.protobuf.Value getVariantRollupValuesOrDefault(
      *          }
      *       }
      *     }
-     * For
-     * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-     * the rollup values is a double value with type
-     * [google.protobuf.Value][google.protobuf.Value]. For example:
+     * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+     * values is a double value with type
+     * [google.protobuf.Value][google.protobuf.Value]. For example,
      * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
      * are 10 variants in this product are available in the store "store1".
      * </pre>
@@ -2469,10 +2460,9 @@ public int getVariantRollupValuesCount() {
        *          }
        *       }
        *     }
-       * For
-       * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-       * the rollup values is a double value with type
-       * [google.protobuf.Value][google.protobuf.Value]. For example:
+       * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+       * values is a double value with type
+       * [google.protobuf.Value][google.protobuf.Value]. For example,
        * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
        * are 10 variants in this product are available in the store "store1".
        * </pre>
@@ -2519,10 +2509,9 @@ public java.util.Map<java.lang.String, com.google.protobuf.Value> getVariantRoll
        *          }
        *       }
        *     }
-       * For
-       * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-       * the rollup values is a double value with type
-       * [google.protobuf.Value][google.protobuf.Value]. For example:
+       * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+       * values is a double value with type
+       * [google.protobuf.Value][google.protobuf.Value]. For example,
        * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
        * are 10 variants in this product are available in the store "store1".
        * </pre>
@@ -2561,10 +2550,9 @@ public java.util.Map<java.lang.String, com.google.protobuf.Value> getVariantRoll
        *          }
        *       }
        *     }
-       * For
-       * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-       * the rollup values is a double value with type
-       * [google.protobuf.Value][google.protobuf.Value]. For example:
+       * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+       * values is a double value with type
+       * [google.protobuf.Value][google.protobuf.Value]. For example,
        * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
        * are 10 variants in this product are available in the store "store1".
        * </pre>
@@ -2608,10 +2596,9 @@ public com.google.protobuf.Value getVariantRollupValuesOrDefault(
        *          }
        *       }
        *     }
-       * For
-       * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-       * the rollup values is a double value with type
-       * [google.protobuf.Value][google.protobuf.Value]. For example:
+       * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+       * values is a double value with type
+       * [google.protobuf.Value][google.protobuf.Value]. For example,
        * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
        * are 10 variants in this product are available in the store "store1".
        * </pre>
@@ -2662,10 +2649,9 @@ public Builder clearVariantRollupValues() {
        *          }
        *       }
        *     }
-       * For
-       * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-       * the rollup values is a double value with type
-       * [google.protobuf.Value][google.protobuf.Value]. For example:
+       * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+       * values is a double value with type
+       * [google.protobuf.Value][google.protobuf.Value]. For example,
        * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
        * are 10 variants in this product are available in the store "store1".
        * </pre>
@@ -2712,10 +2698,9 @@ public Builder removeVariantRollupValues(java.lang.String key) {
        *          }
        *       }
        *     }
-       * For
-       * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-       * the rollup values is a double value with type
-       * [google.protobuf.Value][google.protobuf.Value]. For example:
+       * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+       * values is a double value with type
+       * [google.protobuf.Value][google.protobuf.Value]. For example,
        * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
        * are 10 variants in this product are available in the store "store1".
        * </pre>
@@ -2759,10 +2744,9 @@ public Builder putVariantRollupValues(java.lang.String key, com.google.protobuf.
        *          }
        *       }
        *     }
-       * For
-       * [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-       * the rollup values is a double value with type
-       * [google.protobuf.Value][google.protobuf.Value]. For example:
+       * For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+       * values is a double value with type
+       * [google.protobuf.Value][google.protobuf.Value]. For example,
        * `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
        * are 10 variants in this product are available in the store "store1".
        * </pre>
@@ -5423,6 +5407,21 @@ public interface QueryExpansionInfoOrBuilder
      * @return The expandedQuery.
      */
     boolean getExpandedQuery();
+
+    /**
+     *
+     *
+     * <pre>
+     * Number of pinned results. This field will only be set when expansion
+     * happens and [SearchRequest.query_expansion_spec.pin_unexpanded_results][]
+     * is set to true.
+     * </pre>
+     *
+     * <code>int64 pinned_result_count = 2;</code>
+     *
+     * @return The pinnedResultCount.
+     */
+    long getPinnedResultCount();
   }
   /**
    *
@@ -5480,6 +5479,11 @@ private QueryExpansionInfo(
                 expandedQuery_ = input.readBool();
                 break;
               }
+            case 16:
+              {
+                pinnedResultCount_ = input.readInt64();
+                break;
+              }
             default:
               {
                 if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) {
@@ -5532,6 +5536,26 @@ public boolean getExpandedQuery() {
       return expandedQuery_;
     }
 
+    public static final int PINNED_RESULT_COUNT_FIELD_NUMBER = 2;
+    private long pinnedResultCount_;
+    /**
+     *
+     *
+     * <pre>
+     * Number of pinned results. This field will only be set when expansion
+     * happens and [SearchRequest.query_expansion_spec.pin_unexpanded_results][]
+     * is set to true.
+     * </pre>
+     *
+     * <code>int64 pinned_result_count = 2;</code>
+     *
+     * @return The pinnedResultCount.
+     */
+    @java.lang.Override
+    public long getPinnedResultCount() {
+      return pinnedResultCount_;
+    }
+
     private byte memoizedIsInitialized = -1;
 
     @java.lang.Override
@@ -5549,6 +5573,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io
       if (expandedQuery_ != false) {
         output.writeBool(1, expandedQuery_);
       }
+      if (pinnedResultCount_ != 0L) {
+        output.writeInt64(2, pinnedResultCount_);
+      }
       unknownFields.writeTo(output);
     }
 
@@ -5561,6 +5588,9 @@ public int getSerializedSize() {
       if (expandedQuery_ != false) {
         size += com.google.protobuf.CodedOutputStream.computeBoolSize(1, expandedQuery_);
       }
+      if (pinnedResultCount_ != 0L) {
+        size += com.google.protobuf.CodedOutputStream.computeInt64Size(2, pinnedResultCount_);
+      }
       size += unknownFields.getSerializedSize();
       memoizedSize = size;
       return size;
@@ -5578,6 +5608,7 @@ public boolean equals(final java.lang.Object obj) {
           (com.google.cloud.retail.v2.SearchResponse.QueryExpansionInfo) obj;
 
       if (getExpandedQuery() != other.getExpandedQuery()) return false;
+      if (getPinnedResultCount() != other.getPinnedResultCount()) return false;
       if (!unknownFields.equals(other.unknownFields)) return false;
       return true;
     }
@@ -5591,6 +5622,8 @@ public int hashCode() {
       hash = (19 * hash) + getDescriptor().hashCode();
       hash = (37 * hash) + EXPANDED_QUERY_FIELD_NUMBER;
       hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getExpandedQuery());
+      hash = (37 * hash) + PINNED_RESULT_COUNT_FIELD_NUMBER;
+      hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getPinnedResultCount());
       hash = (29 * hash) + unknownFields.hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -5742,6 +5775,8 @@ public Builder clear() {
         super.clear();
         expandedQuery_ = false;
 
+        pinnedResultCount_ = 0L;
+
         return this;
       }
 
@@ -5771,6 +5806,7 @@ public com.google.cloud.retail.v2.SearchResponse.QueryExpansionInfo buildPartial
         com.google.cloud.retail.v2.SearchResponse.QueryExpansionInfo result =
             new com.google.cloud.retail.v2.SearchResponse.QueryExpansionInfo(this);
         result.expandedQuery_ = expandedQuery_;
+        result.pinnedResultCount_ = pinnedResultCount_;
         onBuilt();
         return result;
       }
@@ -5827,6 +5863,9 @@ public Builder mergeFrom(com.google.cloud.retail.v2.SearchResponse.QueryExpansio
         if (other.getExpandedQuery() != false) {
           setExpandedQuery(other.getExpandedQuery());
         }
+        if (other.getPinnedResultCount() != 0L) {
+          setPinnedResultCount(other.getPinnedResultCount());
+        }
         this.mergeUnknownFields(other.unknownFields);
         onChanged();
         return this;
@@ -5910,6 +5949,64 @@ public Builder clearExpandedQuery() {
         return this;
       }
 
+      private long pinnedResultCount_;
+      /**
+       *
+       *
+       * <pre>
+       * Number of pinned results. This field will only be set when expansion
+       * happens and [SearchRequest.query_expansion_spec.pin_unexpanded_results][]
+       * is set to true.
+       * </pre>
+       *
+       * <code>int64 pinned_result_count = 2;</code>
+       *
+       * @return The pinnedResultCount.
+       */
+      @java.lang.Override
+      public long getPinnedResultCount() {
+        return pinnedResultCount_;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Number of pinned results. This field will only be set when expansion
+       * happens and [SearchRequest.query_expansion_spec.pin_unexpanded_results][]
+       * is set to true.
+       * </pre>
+       *
+       * <code>int64 pinned_result_count = 2;</code>
+       *
+       * @param value The pinnedResultCount to set.
+       * @return This builder for chaining.
+       */
+      public Builder setPinnedResultCount(long value) {
+
+        pinnedResultCount_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       *
+       *
+       * <pre>
+       * Number of pinned results. This field will only be set when expansion
+       * happens and [SearchRequest.query_expansion_spec.pin_unexpanded_results][]
+       * is set to true.
+       * </pre>
+       *
+       * <code>int64 pinned_result_count = 2;</code>
+       *
+       * @return This builder for chaining.
+       */
+      public Builder clearPinnedResultCount() {
+
+        pinnedResultCount_ = 0L;
+        onChanged();
+        return this;
+      }
+
       @java.lang.Override
       public final Builder setUnknownFields(
           final com.google.protobuf.UnknownFieldSet unknownFields) {
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchServiceProto.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchServiceProto.java
index a50b5b12..c850e430 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchServiceProto.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchServiceProto.java
@@ -101,7 +101,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "il/v2/product.proto\032 google/protobuf/fie"
           + "ld_mask.proto\032\034google/protobuf/struct.pr"
           + "oto\032\037google/protobuf/timestamp.proto\032\036go"
-          + "ogle/protobuf/wrappers.proto\"\351\013\n\rSearchR"
+          + "ogle/protobuf/wrappers.proto\"\211\014\n\rSearchR"
           + "equest\022\026\n\tplacement\030\001 \001(\tB\003\340A\002\0221\n\006branch"
           + "\030\002 \001(\tB!\372A\036\n\034retail.googleapis.com/Branc"
           + "h\022\r\n\005query\030\003 \001(\t\022\027\n\nvisitor_id\030\004 \001(\tB\003\340A"
@@ -135,52 +135,53 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "\030\001 \003(\0132B.google.cloud.retail.v2.SearchRe"
           + "quest.BoostSpec.ConditionBoostSpec\0326\n\022Co"
           + "nditionBoostSpec\022\021\n\tcondition\030\001 \001(\t\022\r\n\005b"
-          + "oost\030\002 \001(\002\032\253\001\n\022QueryExpansionSpec\022U\n\tcon"
+          + "oost\030\002 \001(\002\032\313\001\n\022QueryExpansionSpec\022U\n\tcon"
           + "dition\030\001 \001(\0162B.google.cloud.retail.v2.Se"
           + "archRequest.QueryExpansionSpec.Condition"
-          + "\">\n\tCondition\022\031\n\025CONDITION_UNSPECIFIED\020\000"
-          + "\022\014\n\010DISABLED\020\001\022\010\n\004AUTO\020\003\"\367\010\n\016SearchRespo"
-          + "nse\022D\n\007results\030\001 \003(\01323.google.cloud.reta"
-          + "il.v2.SearchResponse.SearchResult\022<\n\006fac"
-          + "ets\030\002 \003(\0132,.google.cloud.retail.v2.Searc"
-          + "hResponse.Facet\022\022\n\ntotal_size\030\003 \001(\005\022\027\n\017c"
-          + "orrected_query\030\004 \001(\t\022\031\n\021attribution_toke"
-          + "n\030\005 \001(\t\022\027\n\017next_page_token\030\006 \001(\t\022W\n\024quer"
-          + "y_expansion_info\030\007 \001(\01329.google.cloud.re"
-          + "tail.v2.SearchResponse.QueryExpansionInf"
-          + "o\022\024\n\014redirect_uri\030\n \001(\t\032\370\003\n\014SearchResult"
-          + "\022\n\n\002id\030\001 \001(\t\0220\n\007product\030\002 \001(\0132\037.google.c"
-          + "loud.retail.v2.Product\022\036\n\026matching_varia"
-          + "nt_count\030\003 \001(\005\022o\n\027matching_variant_field"
-          + "s\030\004 \003(\0132N.google.cloud.retail.v2.SearchR"
-          + "esponse.SearchResult.MatchingVariantFiel"
-          + "dsEntry\022k\n\025variant_rollup_values\030\005 \003(\0132L"
-          + ".google.cloud.retail.v2.SearchResponse.S"
-          + "earchResult.VariantRollupValuesEntry\032X\n\032"
-          + "MatchingVariantFieldsEntry\022\013\n\003key\030\001 \001(\t\022"
-          + ")\n\005value\030\002 \001(\0132\032.google.protobuf.FieldMa"
-          + "sk:\0028\001\032R\n\030VariantRollupValuesEntry\022\013\n\003ke"
-          + "y\030\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.google.protobuf"
-          + ".Value:\0028\001\032\347\001\n\005Facet\022\013\n\003key\030\001 \001(\t\022G\n\006val"
-          + "ues\030\002 \003(\01327.google.cloud.retail.v2.Searc"
-          + "hResponse.Facet.FacetValue\022\025\n\rdynamic_fa"
-          + "cet\030\003 \001(\010\032q\n\nFacetValue\022\017\n\005value\030\001 \001(\tH\000"
-          + "\0224\n\010interval\030\002 \001(\0132 .google.cloud.retail"
-          + ".v2.IntervalH\000\022\r\n\005count\030\003 \001(\003B\r\n\013facet_v"
-          + "alue\032,\n\022QueryExpansionInfo\022\026\n\016expanded_q"
-          + "uery\030\001 \001(\0102\206\002\n\rSearchService\022\251\001\n\006Search\022"
-          + "%.google.cloud.retail.v2.SearchRequest\032&"
-          + ".google.cloud.retail.v2.SearchResponse\"P"
-          + "\202\323\344\223\002J\"E/v2/{placement=projects/*/locati"
-          + "ons/*/catalogs/*/placements/*}:search:\001*"
-          + "\032I\312A\025retail.googleapis.com\322A.https://www"
-          + ".googleapis.com/auth/cloud-platformB\307\001\n\032"
-          + "com.google.cloud.retail.v2B\022SearchServic"
-          + "eProtoP\001Z<google.golang.org/genproto/goo"
-          + "gleapis/cloud/retail/v2;retail\242\002\006RETAIL\252"
-          + "\002\026Google.Cloud.Retail.V2\312\002\026Google\\Cloud\\"
-          + "Retail\\V2\352\002\031Google::Cloud::Retail::V2b\006p"
-          + "roto3"
+          + "\022\036\n\026pin_unexpanded_results\030\002 \001(\010\">\n\tCond"
+          + "ition\022\031\n\025CONDITION_UNSPECIFIED\020\000\022\014\n\010DISA"
+          + "BLED\020\001\022\010\n\004AUTO\020\003\"\224\t\n\016SearchResponse\022D\n\007r"
+          + "esults\030\001 \003(\01323.google.cloud.retail.v2.Se"
+          + "archResponse.SearchResult\022<\n\006facets\030\002 \003("
+          + "\0132,.google.cloud.retail.v2.SearchRespons"
+          + "e.Facet\022\022\n\ntotal_size\030\003 \001(\005\022\027\n\017corrected"
+          + "_query\030\004 \001(\t\022\031\n\021attribution_token\030\005 \001(\t\022"
+          + "\027\n\017next_page_token\030\006 \001(\t\022W\n\024query_expans"
+          + "ion_info\030\007 \001(\01329.google.cloud.retail.v2."
+          + "SearchResponse.QueryExpansionInfo\022\024\n\014red"
+          + "irect_uri\030\n \001(\t\032\370\003\n\014SearchResult\022\n\n\002id\030\001"
+          + " \001(\t\0220\n\007product\030\002 \001(\0132\037.google.cloud.ret"
+          + "ail.v2.Product\022\036\n\026matching_variant_count"
+          + "\030\003 \001(\005\022o\n\027matching_variant_fields\030\004 \003(\0132"
+          + "N.google.cloud.retail.v2.SearchResponse."
+          + "SearchResult.MatchingVariantFieldsEntry\022"
+          + "k\n\025variant_rollup_values\030\005 \003(\0132L.google."
+          + "cloud.retail.v2.SearchResponse.SearchRes"
+          + "ult.VariantRollupValuesEntry\032X\n\032Matching"
+          + "VariantFieldsEntry\022\013\n\003key\030\001 \001(\t\022)\n\005value"
+          + "\030\002 \001(\0132\032.google.protobuf.FieldMask:\0028\001\032R"
+          + "\n\030VariantRollupValuesEntry\022\013\n\003key\030\001 \001(\t\022"
+          + "%\n\005value\030\002 \001(\0132\026.google.protobuf.Value:\002"
+          + "8\001\032\347\001\n\005Facet\022\013\n\003key\030\001 \001(\t\022G\n\006values\030\002 \003("
+          + "\01327.google.cloud.retail.v2.SearchRespons"
+          + "e.Facet.FacetValue\022\025\n\rdynamic_facet\030\003 \001("
+          + "\010\032q\n\nFacetValue\022\017\n\005value\030\001 \001(\tH\000\0224\n\010inte"
+          + "rval\030\002 \001(\0132 .google.cloud.retail.v2.Inte"
+          + "rvalH\000\022\r\n\005count\030\003 \001(\003B\r\n\013facet_value\032I\n\022"
+          + "QueryExpansionInfo\022\026\n\016expanded_query\030\001 \001"
+          + "(\010\022\033\n\023pinned_result_count\030\002 \001(\0032\206\002\n\rSear"
+          + "chService\022\251\001\n\006Search\022%.google.cloud.reta"
+          + "il.v2.SearchRequest\032&.google.cloud.retai"
+          + "l.v2.SearchResponse\"P\202\323\344\223\002J\"E/v2/{placem"
+          + "ent=projects/*/locations/*/catalogs/*/pl"
+          + "acements/*}:search:\001*\032I\312A\025retail.googlea"
+          + "pis.com\322A.https://www.googleapis.com/aut"
+          + "h/cloud-platformB\307\001\n\032com.google.cloud.re"
+          + "tail.v2B\022SearchServiceProtoP\001Z<google.go"
+          + "lang.org/genproto/googleapis/cloud/retai"
+          + "l/v2;retail\242\002\006RETAIL\252\002\026Google.Cloud.Reta"
+          + "il.V2\312\002\026Google\\Cloud\\Retail\\V2\352\002\031Google:"
+          + ":Cloud::Retail::V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -271,7 +272,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_cloud_retail_v2_SearchRequest_QueryExpansionSpec_descriptor,
             new java.lang.String[] {
-              "Condition",
+              "Condition", "PinUnexpandedResults",
             });
     internal_static_google_cloud_retail_v2_SearchResponse_descriptor =
         getDescriptor().getMessageTypes().get(1);
@@ -344,7 +345,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_cloud_retail_v2_SearchResponse_QueryExpansionInfo_descriptor,
             new java.lang.String[] {
-              "ExpandedQuery",
+              "ExpandedQuery", "PinnedResultCount",
             });
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog.proto
index 20cd402c..f449e901 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog_service.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog_service.proto
index 30858061..41523ac8 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog_service.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/catalog_service.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -93,8 +93,8 @@ service CatalogService {
   //   {newBranch}.
   //
   // This feature is only available for users who have Retail Search enabled.
-  // Contact Retail Support (retail-search-support@google.com) if you are
-  // interested in using Retail Search.
+  // Please submit a form [here](https://cloud.google.com/contact) to contact
+  // cloud sales if you are interested in using Retail Search.
   rpc SetDefaultBranch(SetDefaultBranchRequest)
       returns (google.protobuf.Empty) {
     option (google.api.http) = {
@@ -109,8 +109,8 @@ service CatalogService {
   // method under a specified parent catalog.
   //
   // This feature is only available for users who have Retail Search enabled.
-  // Contact Retail Support (retail-search-support@google.com) if you are
-  // interested in using Retail Search.
+  // Please submit a form [here](https://cloud.google.com/contact) to contact
+  // cloud sales if you are interested in using Retail Search.
   rpc GetDefaultBranch(GetDefaultBranchRequest)
       returns (GetDefaultBranchResponse) {
     option (google.api.http) = {
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/common.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/common.proto
index e1e06f87..afbdcd05 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/common.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/common.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/completion_service.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/completion_service.proto
index 478dac63..c18d67d6 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/completion_service.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/completion_service.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -36,8 +36,8 @@ option ruby_package = "Google::Cloud::Retail::V2";
 // Auto-completion service for retail.
 //
 // This feature is only available for users who have Retail Search enabled.
-// Contact Retail Support (retail-search-support@google.com) if you are
-// interested in using Retail Search.
+// Please submit a form [here](https://cloud.google.com/contact) to contact
+// cloud sales if you are interested in using Retail Search.
 service CompletionService {
   option (google.api.default_host) = "retail.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -46,8 +46,8 @@ service CompletionService {
   // Completes the specified prefix with keyword suggestions.
   //
   // This feature is only available for users who have Retail Search enabled.
-  // Contact Retail Support (retail-search-support@google.com) if you are
-  // interested in using Retail Search.
+  // Please submit a form [here](https://cloud.google.com/contact) to contact
+  // cloud sales if you are interested in using Retail Search.
   rpc CompleteQuery(CompleteQueryRequest) returns (CompleteQueryResponse) {
     option (google.api.http) = {
       get: "/v2/{catalog=projects/*/locations/*/catalogs/*}:completeQuery"
@@ -59,8 +59,8 @@ service CompletionService {
   // Request processing may be synchronous. Partial updating is not supported.
   //
   // This feature is only available for users who have Retail Search enabled.
-  // Contact Retail Support (retail-search-support@google.com) if you are
-  // interested in using Retail Search.
+  // Please submit a form [here](https://cloud.google.com/contact) to contact
+  // cloud sales if you are interested in using Retail Search.
   rpc ImportCompletionData(ImportCompletionDataRequest)
       returns (google.longrunning.Operation) {
     option (google.api.http) = {
@@ -135,13 +135,15 @@ message CompleteQueryRequest {
   // * user-data
   //
   // * cloud-retail
-  //   This option is not automatically enabled. Before using cloud-retail,
-  //   contact retail-search-support@google.com first.
+  //   This option requires additional allowlisting. Before using cloud-retail,
+  //   contact Cloud Retail support team first.
   string dataset = 6;
 
-  // Completion max suggestions.
+  // Completion max suggestions. If left unset or set to 0, then will fallback
+  // to the configured value [CompletionConfig.max_suggestions][].
   //
-  // The maximum allowed max suggestions is 20. The default value is 20.
+  // The maximum allowed max suggestions is 20. If it is set higher, it will be
+  // capped by 20.
   int32 max_suggestions = 5;
 }
 
@@ -172,9 +174,9 @@ message CompleteQueryResponse {
   // performance.
   string attribution_token = 2;
 
-  // Matched recent searches of this user. This field is a restricted feature.
-  // Contact Retail Support (retail-search-support@google.com) if you are
-  // interested in enabling it.
+  // Matched recent searches of this user. The maximum number of recent searches
+  // is 10. This field is a restricted feature. Contact Retail Search support
+  // team if you are interested in enabling it.
   //
   // This feature is only available when
   // [CompleteQueryRequest.visitor_id][google.cloud.retail.v2.CompleteQueryRequest.visitor_id]
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/import_config.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/import_config.proto
index 1fb849da..25170d4c 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/import_config.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/import_config.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -160,13 +160,13 @@ message ImportProductsRequest {
     // Can only be while using
     // [BigQuerySource][google.cloud.retail.v2.BigQuerySource].
     //
-    // Add the IAM permission “BigQuery Data Viewer” for
+    // Add the IAM permission "BigQuery Data Viewer" for
     // cloud-retail-customer-data-access@system.gserviceaccount.com before
     // using this feature otherwise an error is thrown.
     //
     // This feature is only available for users who have Retail Search enabled.
-    // Contact Retail Support (retail-search-support@google.com) if you are
-    // interested in using Retail Search.
+    // Please submit a form [here](https://cloud.google.com/contact) to contact
+    // cloud sales if you are interested in using Retail Search.
     FULL = 2;
   }
 
@@ -303,7 +303,7 @@ message CompletionDataInputConfig {
   oneof source {
     // Required. BigQuery input source.
     //
-    // Add the IAM permission “BigQuery Data Viewer” for
+    // Add the IAM permission "BigQuery Data Viewer" for
     // cloud-retail-customer-data-access@system.gserviceaccount.com before
     // using this feature otherwise an error is thrown.
     BigQuerySource big_query_source = 1
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/prediction_service.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/prediction_service.proto
index 067f872b..da588a03 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/prediction_service.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/prediction_service.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product.proto
index 746dc625..eaefca4c 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -310,13 +310,9 @@ message Product {
   // This field needs to pass all below criteria, otherwise an INVALID_ARGUMENT
   // error is returned:
   //
-  // * Max entries count: 200 by default; 100 for
-  // [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
+  // * Max entries count: 200.
   // * The key must be a UTF-8 encoded string with a length limit of 128
   //   characters.
-  // * Max indexable entries count: 200 by default; 40 for
-  // [Type.VARIANT][google.cloud.retail.v2.Product.Type.VARIANT].
-  // * Max searchable entries count: 30.
   // * For indexable attribute, the key must match the pattern:
   //   [a-zA-Z0-9][a-zA-Z0-9_]*. For example, key0LikeThis or KEY_1_LIKE_THIS.
   map<string, CustomAttribute> attributes = 12;
@@ -426,7 +422,7 @@ message Product {
 
   // The material of the product. For example, "leather", "wooden".
   //
-  // A maximum of 5 values are allowed. Each value must be a UTF-8 encoded
+  // A maximum of 20 values are allowed. Each value must be a UTF-8 encoded
   // string with a length limit of 128 characters. Otherwise, an
   // INVALID_ARGUMENT error is returned.
   //
@@ -525,8 +521,12 @@ message Product {
   // * [name][google.cloud.retail.v2.Product.name]
   // * [color_info][google.cloud.retail.v2.Product.color_info]
   //
-  // Maximum number of paths is 20. Otherwise, an INVALID_ARGUMENT error is
+  // Maximum number of paths is 30. Otherwise, an INVALID_ARGUMENT error is
   // returned.
+  //
+  // Note: Returning more fields in
+  // [SearchResponse][google.cloud.retail.v2.SearchResponse] may increase
+  // response payload size and serving latency.
   google.protobuf.FieldMask retrievable_fields = 30;
 
   // Output only. Product variants grouped together on primary product which
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product_service.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product_service.proto
index dac78fbc..3c381eb3 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product_service.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product_service.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -143,8 +143,8 @@ service ProductService {
   // [RemoveFulfillmentPlaces][google.cloud.retail.v2.ProductService.RemoveFulfillmentPlaces].
   //
   // This feature is only available for users who have Retail Search enabled.
-  // Contact Retail Support (retail-search-support@google.com) if you are
-  // interested in using Retail Search.
+  // Please submit a form [here](https://cloud.google.com/contact) to contact
+  // cloud sales if you are interested in using Retail Search.
   rpc SetInventory(SetInventoryRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{inventory.name=projects/*/locations/*/catalogs/*/branches/*/products/**}:setInventory"
@@ -170,8 +170,8 @@ service ProductService {
   // [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
   //
   // This feature is only available for users who have Retail Search enabled.
-  // Contact Retail Support (retail-search-support@google.com) if you are
-  // interested in using Retail Search.
+  // Please submit a form [here](https://cloud.google.com/contact) to contact
+  // cloud sales if you are interested in using Retail Search.
   rpc AddFulfillmentPlaces(AddFulfillmentPlacesRequest)
       returns (google.longrunning.Operation) {
     option (google.api.http) = {
@@ -198,8 +198,8 @@ service ProductService {
   // [ListProducts][google.cloud.retail.v2.ProductService.ListProducts].
   //
   // This feature is only available for users who have Retail Search enabled.
-  // Contact Retail Support (retail-search-support@google.com) if you are
-  // interested in using Retail Search.
+  // Please submit a form [here](https://cloud.google.com/contact) to contact
+  // cloud sales if you are interested in using Retail Search.
   rpc RemoveFulfillmentPlaces(RemoveFulfillmentPlacesRequest)
       returns (google.longrunning.Operation) {
     option (google.api.http) = {
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/purge_config.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/purge_config.proto
index 588bb39b..6c8ce100 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/purge_config.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/purge_config.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto
index 4522d546..acc6010c 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -39,8 +39,8 @@ option ruby_package = "Google::Cloud::Retail::V2";
 // Service for search.
 //
 // This feature is only available for users who have Retail Search enabled.
-// Contact Retail Support (retail-search-support@google.com) if you are
-// interested in using Retail Search.
+// Please submit a form [here](https://cloud.google.com/contact) to contact
+// cloud sales if you are interested in using Retail Search.
 service SearchService {
   option (google.api.default_host) = "retail.googleapis.com";
   option (google.api.oauth_scopes) =
@@ -49,8 +49,8 @@ service SearchService {
   // Performs a search.
   //
   // This feature is only available for users who have Retail Search enabled.
-  // Contact Retail Support (retail-search-support@google.com) if you are
-  // interested in using Retail Search.
+  // Please submit a form [here](https://cloud.google.com/contact) to contact
+  // cloud sales if you are interested in using Retail Search.
   rpc Search(SearchRequest) returns (SearchResponse) {
     option (google.api.http) = {
       post: "/v2/{placement=projects/*/locations/*/catalogs/*/placements/*}:search"
@@ -74,35 +74,35 @@ message SearchRequest {
       // [FacetKey.query][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.query]
       // is not specified:
       //
-      // Textual facet keys:
-      // * brands
-      // * categories
-      // * genders
-      // * ageGroups
-      // * availability
-      // * colorFamilies
-      // * colors
-      // * sizes
-      // * materials
-      // * patterns
-      // * conditions
-      // * attributes.key
-      // * pickupInStore
-      // * shipToStore
-      // * sameDayDelivery
-      // * nextDayDelivery
-      // * customFulfillment1
-      // * customFulfillment2
-      // * customFulfillment3
-      // * customFulfillment4
-      // * customFulfillment5
+      // * textual_field =
+      //     * "brands"
+      //     * "categories"
+      //     * "genders"
+      //     * "ageGroups"
+      //     * "availability"
+      //     * "colorFamilies"
+      //     * "colors"
+      //     * "sizes"
+      //     * "materials"
+      //     * "patterns"
+      //     * "conditions"
+      //     * "attributes.key"
+      //     * "pickupInStore"
+      //     * "shipToStore"
+      //     * "sameDayDelivery"
+      //     * "nextDayDelivery"
+      //     * "customFulfillment1"
+      //     * "customFulfillment2"
+      //     * "customFulfillment3"
+      //     * "customFulfillment4"
+      //     * "customFulfillment5"
       //
-      // Numeric facet keys:
-      // * price
-      // * discount
-      // * rating
-      // * ratingCount
-      // * attributes.key
+      // * numerical_field =
+      //     * "price"
+      //     * "discount"
+      //     * "rating"
+      //     * "ratingCount"
+      //     * "attributes.key"
       string key = 1 [(google.api.field_behavior) = REQUIRED];
 
       // Set only if values should be bucketized into intervals. Must be set
@@ -166,7 +166,8 @@ message SearchRequest {
       // order](https://en.wikipedia.org/wiki/Natural_sort_order); numerical
       // intervals are sorted in the order given by
       // [FacetSpec.FacetKey.intervals][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.intervals];
-      // [FulfillmentInfo.ids][] are sorted in the order given by
+      // [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+      // are sorted in the order given by
       // [FacetSpec.FacetKey.restricted_values][google.cloud.retail.v2.SearchRequest.FacetSpec.FacetKey.restricted_values].
       string order_by = 4;
 
@@ -287,12 +288,11 @@ message SearchRequest {
       // Examples:
       //
       // * To boost products with product ID "product_1" or "product_2", and
-      // color "Red" or "Blue":
-      //   ```
-      //   (id: ANY("product_1", "product_2"))
-      //   AND
-      //   (colorFamilies: ANY("Red", "Blue"))
-      //   ```
+      // color
+      //   "Red" or "Blue":<br>
+      //   *(id: ANY("product_1", "product_2"))<br>*
+      //   *AND<br>*
+      //   *(colorFamilies: ANY("Red", "Blue"))<br>*
       string condition = 1;
 
       // Strength of the condition boost, which should be in [-1, 1]. Negative
@@ -343,6 +343,11 @@ message SearchRequest {
     // The condition under which query expansion should occur. Default to
     // [Condition.DISABLED][google.cloud.retail.v2.SearchRequest.QueryExpansionSpec.Condition.DISABLED].
     Condition condition = 1;
+
+    // Whether to pin unexpanded results. If this field is set to true,
+    // unexpanded products are always at the top of the search results, followed
+    // by the expanded results.
+    bool pin_unexpanded_results = 2;
   }
 
   // Required. The resource name of the search engine placement, such as
@@ -409,7 +414,8 @@ message SearchRequest {
 
   // The filter syntax consists of an expression language for constructing a
   // predicate from one or more fields of the products being filtered. Filter
-  // expression is case-sensitive.
+  // expression is case-sensitive. See more details at this [user
+  // guide](/retail/private/docs/filter-and-order#filter).
   //
   // If this field is unrecognizable, an INVALID_ARGUMENT is returned.
   string filter = 10;
@@ -427,7 +433,9 @@ message SearchRequest {
 
   // The order in which products are returned. Products can be ordered by
   // a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-  // unset if ordered by relevance. OrderBy expression is case-sensitive.
+  // unset if ordered by relevance. OrderBy expression is case-sensitive. See
+  // more details at this [user
+  // guide](/retail/private/docs/filter-and-order#order).
   //
   // If this field is unrecognizable, an INVALID_ARGUMENT is returned.
   string order_by = 11;
@@ -441,16 +449,17 @@ message SearchRequest {
   // The specification for dynamically generated facets. Notice that only
   // textual facets can be dynamically generated.
   //
-  // This feature requires additional allowlisting. Contact Retail Support
-  // (retail-search-support@google.com) if you are interested in using dynamic
-  // facet feature.
+  // This feature requires additional allowlisting. Contact Retail Search
+  // support team if you are interested in using dynamic facet feature.
   DynamicFacetSpec dynamic_facet_spec = 21;
 
-  // Boost specification to boost certain products.
+  // Boost specification to boost certain products. See more details at this
+  // [user guide](/retail/private/docs/boosting).
   BoostSpec boost_spec = 13;
 
   // The query expansion specification that specifies the conditions under which
-  // query expansion will occur.
+  // query expansion will occur. See more details at this [user
+  // guide](/retail/private/docs/result-size#query_expansion).
   QueryExpansionSpec query_expansion_spec = 14;
 
   // The keys to fetch and rollup the matching
@@ -462,10 +471,9 @@ message SearchRequest {
   // [Product][google.cloud.retail.v2.Product]s attributes will lead to extra
   // query latency. Maximum number of keys is 10.
   //
-  // For
-  // [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-  // a fulfillment type and a fulfillment ID must be provided in the format of
-  // "fulfillmentType.filfillmentId". E.g., in "pickupInStore.store123",
+  // For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], a
+  // fulfillment type and a fulfillment ID must be provided in the format of
+  // "fulfillmentType.fulfillmentId". E.g., in "pickupInStore.store123",
   // "pickupInStore" is fulfillment type and "store123" is the store ID.
   //
   // Supported keys are:
@@ -476,24 +484,42 @@ message SearchRequest {
   // * discount
   // * attributes.key, where key is any key in the
   //   [Product.attributes][google.cloud.retail.v2.Product.attributes] map.
-  // * pickupInStore.id, where id is any [FulfillmentInfo.ids][] for type
-  //   [FulfillmentInfo.Type.PICKUP_IN_STORE][].
-  // * shipToStore.id, where id is any [FulfillmentInfo.ids][] for type
-  //   [FulfillmentInfo.Type.SHIP_TO_STORE][].
-  // * sameDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-  //   [FulfillmentInfo.Type.SAME_DAY_DELIVERY][].
-  // * nextDayDelivery.id, where id is any [FulfillmentInfo.ids][] for type
-  //   [FulfillmentInfo.Type.NEXT_DAY_DELIVERY][].
-  // * customFulfillment1.id, where id is any [FulfillmentInfo.ids][] for type
-  //   [FulfillmentInfo.Type.CUSTOM_TYPE_1][].
-  // * customFulfillment2.id, where id is any [FulfillmentInfo.ids][] for type
-  //   [FulfillmentInfo.Type.CUSTOM_TYPE_2][].
-  // * customFulfillment3.id, where id is any [FulfillmentInfo.ids][] for type
-  //   [FulfillmentInfo.Type.CUSTOM_TYPE_3][].
-  // * customFulfillment4.id, where id is any [FulfillmentInfo.ids][] for type
-  //   [FulfillmentInfo.Type.CUSTOM_TYPE_4][].
-  // * customFulfillment5.id, where id is any [FulfillmentInfo.ids][] for type
-  //   [FulfillmentInfo.Type.CUSTOM_TYPE_5][].
+  // * pickupInStore.id, where id is any
+  // [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+  // for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+  //   "pickup-in-store".
+  // * shipToStore.id, where id is any
+  // [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+  // for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+  //   "ship-to-store".
+  // * sameDayDelivery.id, where id is any
+  // [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+  // for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+  //   "same-day-delivery".
+  // * nextDayDelivery.id, where id is any
+  // [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+  // for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+  //   "next-day-delivery".
+  // * customFulfillment1.id, where id is any
+  // [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+  // for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+  //   "custom-type-1".
+  // * customFulfillment2.id, where id is any
+  // [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+  // for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+  //   "custom-type-2".
+  // * customFulfillment3.id, where id is any
+  // [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+  // for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+  //   "custom-type-3".
+  // * customFulfillment4.id, where id is any
+  // [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+  // for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+  //   "custom-type-4".
+  // * customFulfillment5.id, where id is any
+  // [FulfillmentInfo.place_ids][google.cloud.retail.v2.FulfillmentInfo.place_ids]
+  // for [FulfillmentInfo.type][google.cloud.retail.v2.FulfillmentInfo.type]
+  //   "custom-type-5".
   //
   // If this field is set to an invalid value other than these, an
   // INVALID_ARGUMENT error is returned.
@@ -583,10 +609,9 @@ message SearchResponse {
     //       }
     //     }
     //
-    // For
-    // [Product.fulfillment_info][google.cloud.retail.v2.Product.fulfillment_info],
-    // the rollup values is a double value with type
-    // [google.protobuf.Value][google.protobuf.Value]. For example:
+    // For [FulfillmentInfo][google.cloud.retail.v2.FulfillmentInfo], the rollup
+    // values is a double value with type
+    // [google.protobuf.Value][google.protobuf.Value]. For example,
     // `{key: "pickupInStore.store1" value { number_value: 10 }}` means a there
     // are 10 variants in this product are available in the store "store1".
     map<string, google.protobuf.Value> variant_rollup_values = 5;
@@ -625,6 +650,11 @@ message SearchResponse {
   message QueryExpansionInfo {
     // Bool describing whether query expansion has occurred.
     bool expanded_query = 1;
+
+    // Number of pinned results. This field will only be set when expansion
+    // happens and [SearchRequest.query_expansion_spec.pin_unexpanded_results][]
+    // is set to true.
+    int64 pinned_result_count = 2;
   }
 
   // A list of matched items. The order represents the ranking.
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event.proto
index 7534edf3..e4bb810b 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -258,9 +258,21 @@ message UserEvent {
 message ProductDetail {
   // Required. [Product][google.cloud.retail.v2.Product] information.
   //
-  // Only [Product.id][google.cloud.retail.v2.Product.id] field is used when
-  // ingesting an event, all other product fields are ignored as we will look
-  // them up from the catalog.
+  // Required field(s):
+  //
+  // * [Product.id][google.cloud.retail.v2.Product.id]
+  //
+  // Optional override field(s):
+  //
+  // * [Product.price_info][google.cloud.retail.v2.Product.price_info]
+  //
+  // If any supported optional fields are provided, we will treat them as a full
+  // override when looking up product information from the catalog. Thus, it is
+  // important to ensure that the overriding fields are accurate and
+  // complete.
+  //
+  // All other product fields are ignored and instead populated via catalog
+  // lookup after event ingestion.
   Product product = 1 [(google.api.field_behavior) = REQUIRED];
 
   // Quantity of the product associated with the user event.
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event_service.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event_service.proto
index 4dbd1dc7..2d48a511 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event_service.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event_service.proto
@@ -1,4 +1,4 @@
-// Copyright 2020 Google LLC
+// Copyright 2021 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/synth.metadata b/synth.metadata
index 5486403c..3d3a2811 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-retail.git",
-        "sha": "9562b19a2e1d0378219f1ec419ff7e5cbc91b7f5"
+        "sha": "57e3a553fb3e1e8a105666ab174bfd615ca4b801"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "e1738ee972b49fd0c4d4718b035444495142b781",
-        "internalRef": "391407209"
+        "sha": "62d50355dff115d1b566a77bbcd6ae087fb470c0",
+        "internalRef": "391605108"
       }
     },
     {

From ab981f672f14842d7e4daf697b2de68a715d072e Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Wed, 1 Sep 2021 01:34:58 -0700
Subject: [PATCH 2/2] docs: Keep the API doc up-to-date feat: update grpc
 service config settings to reflect correct API deadlines chore: remove
 relative private links from search service comments to prevent crashing
 client lib generation tool

PiperOrigin-RevId: 392712211

Source-Author: Google APIs <noreply@google.com>
Source-Date: Tue Aug 24 11:46:03 2021 -0700
Source-Repo: googleapis/googleapis
Source-Sha: cb637a6db2a0e406d656055a286ad921134c7d57
Source-Link: https://github.com/googleapis/googleapis/commit/cb637a6db2a0e406d656055a286ad921134c7d57
---
 .../v2/stub/CatalogServiceStubSettings.java   |   8 +-
 .../stub/CompletionServiceStubSettings.java   |   8 +-
 .../stub/PredictionServiceStubSettings.java   |   8 +-
 .../v2/stub/ProductServiceStubSettings.java   |  80 +++++---
 .../v2/stub/SearchServiceStubSettings.java    |   8 +-
 .../v2/stub/UserEventServiceStubSettings.java |  56 ++++--
 .../com/google/cloud/retail/v2/Product.java   |  40 ++--
 .../cloud/retail/v2/ProductOrBuilder.java     |  12 +-
 .../google/cloud/retail/v2/SearchRequest.java | 184 +++++++-----------
 .../retail/v2/SearchRequestOrBuilder.java     |  32 +--
 .../google/cloud/retail/v2/product.proto      |   5 +-
 .../cloud/retail/v2/search_service.proto      |  20 +-
 synth.metadata                                |   4 +-
 13 files changed, 231 insertions(+), 234 deletions(-)

diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/CatalogServiceStubSettings.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/CatalogServiceStubSettings.java
index 8acfd767..b63de9c9 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/CatalogServiceStubSettings.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/CatalogServiceStubSettings.java
@@ -294,11 +294,11 @@ public static class Builder extends StubSettings.Builder<CatalogServiceStubSetti
           RetrySettings.newBuilder()
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
-              .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setMaxRetryDelay(Duration.ofMillis(5000L))
+              .setInitialRpcTimeout(Duration.ofMillis(5000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(60000L))
-              .setTotalTimeout(Duration.ofMillis(60000L))
+              .setMaxRpcTimeout(Duration.ofMillis(5000L))
+              .setTotalTimeout(Duration.ofMillis(5000L))
               .build();
       definitions.put("retry_policy_0_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/CompletionServiceStubSettings.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/CompletionServiceStubSettings.java
index ac74e56d..9dd60724 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/CompletionServiceStubSettings.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/CompletionServiceStubSettings.java
@@ -229,11 +229,11 @@ public static class Builder extends StubSettings.Builder<CompletionServiceStubSe
           RetrySettings.newBuilder()
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
-              .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setMaxRetryDelay(Duration.ofMillis(5000L))
+              .setInitialRpcTimeout(Duration.ofMillis(5000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(60000L))
-              .setTotalTimeout(Duration.ofMillis(60000L))
+              .setMaxRpcTimeout(Duration.ofMillis(5000L))
+              .setTotalTimeout(Duration.ofMillis(5000L))
               .build();
       definitions.put("retry_policy_0_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/PredictionServiceStubSettings.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/PredictionServiceStubSettings.java
index 72c59428..f48550e8 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/PredictionServiceStubSettings.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/PredictionServiceStubSettings.java
@@ -194,11 +194,11 @@ public static class Builder extends StubSettings.Builder<PredictionServiceStubSe
           RetrySettings.newBuilder()
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
-              .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setMaxRetryDelay(Duration.ofMillis(5000L))
+              .setInitialRpcTimeout(Duration.ofMillis(5000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(60000L))
-              .setTotalTimeout(Duration.ofMillis(60000L))
+              .setMaxRpcTimeout(Duration.ofMillis(5000L))
+              .setTotalTimeout(Duration.ofMillis(5000L))
               .build();
       definitions.put("retry_policy_0_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/ProductServiceStubSettings.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/ProductServiceStubSettings.java
index d8c5a3df..6e8d171f 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/ProductServiceStubSettings.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/ProductServiceStubSettings.java
@@ -398,7 +398,12 @@ public static class Builder extends StubSettings.Builder<ProductServiceStubSetti
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "retry_policy_0_codes",
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
+      definitions.put(
+          "retry_policy_2_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
@@ -414,13 +419,24 @@ public static class Builder extends StubSettings.Builder<ProductServiceStubSetti
           RetrySettings.newBuilder()
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
-              .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setMaxRetryDelay(Duration.ofMillis(30000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(300000L))
+              .setInitialRpcTimeout(Duration.ofMillis(300000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(60000L))
-              .setTotalTimeout(Duration.ofMillis(60000L))
+              .setMaxRpcTimeout(Duration.ofMillis(300000L))
+              .setTotalTimeout(Duration.ofMillis(300000L))
               .build();
-      definitions.put("retry_policy_0_params", settings);
+      definitions.put("retry_policy_2_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -507,56 +523,56 @@ private static Builder createDefault() {
     private static Builder initDefaults(Builder builder) {
       builder
           .createProductSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .getProductSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .listProductsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .updateProductSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .deleteProductSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .importProductsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
 
       builder
           .setInventorySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .addFulfillmentPlacesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .removeFulfillmentPlacesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .importProductsOperationSettings()
           .setInitialCallSettings(
               UnaryCallSettings
                   .<ImportProductsRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(ImportProductsResponse.class))
@@ -579,8 +595,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<SetInventoryRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(SetInventoryResponse.class))
@@ -603,8 +619,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<AddFulfillmentPlacesRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(
@@ -629,8 +645,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<RemoveFulfillmentPlacesRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(
diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/SearchServiceStubSettings.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/SearchServiceStubSettings.java
index 9af7dcc3..b204cc6b 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/SearchServiceStubSettings.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/SearchServiceStubSettings.java
@@ -256,11 +256,11 @@ public static class Builder extends StubSettings.Builder<SearchServiceStubSettin
           RetrySettings.newBuilder()
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
-              .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setMaxRetryDelay(Duration.ofMillis(5000L))
+              .setInitialRpcTimeout(Duration.ofMillis(5000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(60000L))
-              .setTotalTimeout(Duration.ofMillis(60000L))
+              .setMaxRpcTimeout(Duration.ofMillis(5000L))
+              .setTotalTimeout(Duration.ofMillis(5000L))
               .build();
       definitions.put("retry_policy_0_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
diff --git a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/UserEventServiceStubSettings.java b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/UserEventServiceStubSettings.java
index 4287c646..996d8d05 100644
--- a/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/UserEventServiceStubSettings.java
+++ b/google-cloud-retail/src/main/java/com/google/cloud/retail/v2/stub/UserEventServiceStubSettings.java
@@ -274,6 +274,16 @@ public static class Builder extends StubSettings.Builder<UserEventServiceStubSet
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
+      definitions.put(
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.UNAVAILABLE, StatusCode.Code.DEADLINE_EXCEEDED)));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -286,13 +296,35 @@ public static class Builder extends StubSettings.Builder<UserEventServiceStubSet
           RetrySettings.newBuilder()
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
-              .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setMaxRetryDelay(Duration.ofMillis(5000L))
+              .setInitialRpcTimeout(Duration.ofMillis(5000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(60000L))
-              .setTotalTimeout(Duration.ofMillis(60000L))
+              .setMaxRpcTimeout(Duration.ofMillis(5000L))
+              .setTotalTimeout(Duration.ofMillis(5000L))
               .build();
       definitions.put("retry_policy_0_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(30000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(300000L))
+              .setInitialRpcTimeout(Duration.ofMillis(300000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(300000L))
+              .setTotalTimeout(Duration.ofMillis(300000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -369,13 +401,13 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .purgeUserEventsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .importUserEventsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
 
       builder
           .rejoinUserEventsSettings()
@@ -387,8 +419,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<PurgeUserEventsRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(PurgeUserEventsResponse.class))
@@ -411,8 +443,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<ImportUserEventsRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_0_codes"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_0_params"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(ImportUserEventsResponse.class))
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/Product.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/Product.java
index 2a02b3a1..ed9d54f5 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/Product.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/Product.java
@@ -1509,6 +1509,8 @@ public com.google.protobuf.ByteString getCollectionMemberIdsBytes(int index) {
    * The Global Trade Item Number (GTIN) of the product.
    * This field must be a UTF-8 encoded string with a length limit of 128
    * characters. Otherwise, an INVALID_ARGUMENT error is returned.
+   * This field must be a Unigram. Otherwise, an INVALID_ARGUMENT error is
+   * returned.
    * Google Merchant Center property
    * [gtin](https://support.google.com/merchants/answer/6324461).
    * Schema.org property
@@ -1543,6 +1545,8 @@ public java.lang.String getGtin() {
    * The Global Trade Item Number (GTIN) of the product.
    * This field must be a UTF-8 encoded string with a length limit of 128
    * characters. Otherwise, an INVALID_ARGUMENT error is returned.
+   * This field must be a Unigram. Otherwise, an INVALID_ARGUMENT error is
+   * returned.
    * Google Merchant Center property
    * [gtin](https://support.google.com/merchants/answer/6324461).
    * Schema.org property
@@ -3086,7 +3090,7 @@ public com.google.protobuf.ByteString getMaterialsBytes(int index) {
    * <pre>
    * The pattern or graphic print of the product. For example, "striped", "polka
    * dot", "paisley".
-   * A maximum of 5 values are allowed per
+   * A maximum of 20 values are allowed per
    * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
    * encoded string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
@@ -3108,7 +3112,7 @@ public com.google.protobuf.ProtocolStringList getPatternsList() {
    * <pre>
    * The pattern or graphic print of the product. For example, "striped", "polka
    * dot", "paisley".
-   * A maximum of 5 values are allowed per
+   * A maximum of 20 values are allowed per
    * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
    * encoded string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
@@ -3130,7 +3134,7 @@ public int getPatternsCount() {
    * <pre>
    * The pattern or graphic print of the product. For example, "striped", "polka
    * dot", "paisley".
-   * A maximum of 5 values are allowed per
+   * A maximum of 20 values are allowed per
    * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
    * encoded string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
@@ -3153,7 +3157,7 @@ public java.lang.String getPatterns(int index) {
    * <pre>
    * The pattern or graphic print of the product. For example, "striped", "polka
    * dot", "paisley".
-   * A maximum of 5 values are allowed per
+   * A maximum of 20 values are allowed per
    * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
    * encoded string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
@@ -6395,6 +6399,8 @@ public Builder addCollectionMemberIdsBytes(com.google.protobuf.ByteString value)
      * The Global Trade Item Number (GTIN) of the product.
      * This field must be a UTF-8 encoded string with a length limit of 128
      * characters. Otherwise, an INVALID_ARGUMENT error is returned.
+     * This field must be a Unigram. Otherwise, an INVALID_ARGUMENT error is
+     * returned.
      * Google Merchant Center property
      * [gtin](https://support.google.com/merchants/answer/6324461).
      * Schema.org property
@@ -6428,6 +6434,8 @@ public java.lang.String getGtin() {
      * The Global Trade Item Number (GTIN) of the product.
      * This field must be a UTF-8 encoded string with a length limit of 128
      * characters. Otherwise, an INVALID_ARGUMENT error is returned.
+     * This field must be a Unigram. Otherwise, an INVALID_ARGUMENT error is
+     * returned.
      * Google Merchant Center property
      * [gtin](https://support.google.com/merchants/answer/6324461).
      * Schema.org property
@@ -6461,6 +6469,8 @@ public com.google.protobuf.ByteString getGtinBytes() {
      * The Global Trade Item Number (GTIN) of the product.
      * This field must be a UTF-8 encoded string with a length limit of 128
      * characters. Otherwise, an INVALID_ARGUMENT error is returned.
+     * This field must be a Unigram. Otherwise, an INVALID_ARGUMENT error is
+     * returned.
      * Google Merchant Center property
      * [gtin](https://support.google.com/merchants/answer/6324461).
      * Schema.org property
@@ -6493,6 +6503,8 @@ public Builder setGtin(java.lang.String value) {
      * The Global Trade Item Number (GTIN) of the product.
      * This field must be a UTF-8 encoded string with a length limit of 128
      * characters. Otherwise, an INVALID_ARGUMENT error is returned.
+     * This field must be a Unigram. Otherwise, an INVALID_ARGUMENT error is
+     * returned.
      * Google Merchant Center property
      * [gtin](https://support.google.com/merchants/answer/6324461).
      * Schema.org property
@@ -6521,6 +6533,8 @@ public Builder clearGtin() {
      * The Global Trade Item Number (GTIN) of the product.
      * This field must be a UTF-8 encoded string with a length limit of 128
      * characters. Otherwise, an INVALID_ARGUMENT error is returned.
+     * This field must be a Unigram. Otherwise, an INVALID_ARGUMENT error is
+     * returned.
      * Google Merchant Center property
      * [gtin](https://support.google.com/merchants/answer/6324461).
      * Schema.org property
@@ -10939,7 +10953,7 @@ private void ensurePatternsIsMutable() {
      * <pre>
      * The pattern or graphic print of the product. For example, "striped", "polka
      * dot", "paisley".
-     * A maximum of 5 values are allowed per
+     * A maximum of 20 values are allowed per
      * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
      * encoded string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
@@ -10961,7 +10975,7 @@ public com.google.protobuf.ProtocolStringList getPatternsList() {
      * <pre>
      * The pattern or graphic print of the product. For example, "striped", "polka
      * dot", "paisley".
-     * A maximum of 5 values are allowed per
+     * A maximum of 20 values are allowed per
      * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
      * encoded string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
@@ -10983,7 +10997,7 @@ public int getPatternsCount() {
      * <pre>
      * The pattern or graphic print of the product. For example, "striped", "polka
      * dot", "paisley".
-     * A maximum of 5 values are allowed per
+     * A maximum of 20 values are allowed per
      * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
      * encoded string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
@@ -11006,7 +11020,7 @@ public java.lang.String getPatterns(int index) {
      * <pre>
      * The pattern or graphic print of the product. For example, "striped", "polka
      * dot", "paisley".
-     * A maximum of 5 values are allowed per
+     * A maximum of 20 values are allowed per
      * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
      * encoded string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
@@ -11029,7 +11043,7 @@ public com.google.protobuf.ByteString getPatternsBytes(int index) {
      * <pre>
      * The pattern or graphic print of the product. For example, "striped", "polka
      * dot", "paisley".
-     * A maximum of 5 values are allowed per
+     * A maximum of 20 values are allowed per
      * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
      * encoded string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
@@ -11059,7 +11073,7 @@ public Builder setPatterns(int index, java.lang.String value) {
      * <pre>
      * The pattern or graphic print of the product. For example, "striped", "polka
      * dot", "paisley".
-     * A maximum of 5 values are allowed per
+     * A maximum of 20 values are allowed per
      * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
      * encoded string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
@@ -11088,7 +11102,7 @@ public Builder addPatterns(java.lang.String value) {
      * <pre>
      * The pattern or graphic print of the product. For example, "striped", "polka
      * dot", "paisley".
-     * A maximum of 5 values are allowed per
+     * A maximum of 20 values are allowed per
      * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
      * encoded string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
@@ -11114,7 +11128,7 @@ public Builder addAllPatterns(java.lang.Iterable<java.lang.String> values) {
      * <pre>
      * The pattern or graphic print of the product. For example, "striped", "polka
      * dot", "paisley".
-     * A maximum of 5 values are allowed per
+     * A maximum of 20 values are allowed per
      * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
      * encoded string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
@@ -11139,7 +11153,7 @@ public Builder clearPatterns() {
      * <pre>
      * The pattern or graphic print of the product. For example, "striped", "polka
      * dot", "paisley".
-     * A maximum of 5 values are allowed per
+     * A maximum of 20 values are allowed per
      * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
      * encoded string with a length limit of 128 characters. Otherwise, an
      * INVALID_ARGUMENT error is returned.
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductOrBuilder.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductOrBuilder.java
index 5f03dea3..0f99170e 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductOrBuilder.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/ProductOrBuilder.java
@@ -399,6 +399,8 @@ public interface ProductOrBuilder
    * The Global Trade Item Number (GTIN) of the product.
    * This field must be a UTF-8 encoded string with a length limit of 128
    * characters. Otherwise, an INVALID_ARGUMENT error is returned.
+   * This field must be a Unigram. Otherwise, an INVALID_ARGUMENT error is
+   * returned.
    * Google Merchant Center property
    * [gtin](https://support.google.com/merchants/answer/6324461).
    * Schema.org property
@@ -422,6 +424,8 @@ public interface ProductOrBuilder
    * The Global Trade Item Number (GTIN) of the product.
    * This field must be a UTF-8 encoded string with a length limit of 128
    * characters. Otherwise, an INVALID_ARGUMENT error is returned.
+   * This field must be a Unigram. Otherwise, an INVALID_ARGUMENT error is
+   * returned.
    * Google Merchant Center property
    * [gtin](https://support.google.com/merchants/answer/6324461).
    * Schema.org property
@@ -1650,7 +1654,7 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    * <pre>
    * The pattern or graphic print of the product. For example, "striped", "polka
    * dot", "paisley".
-   * A maximum of 5 values are allowed per
+   * A maximum of 20 values are allowed per
    * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
    * encoded string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
@@ -1670,7 +1674,7 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    * <pre>
    * The pattern or graphic print of the product. For example, "striped", "polka
    * dot", "paisley".
-   * A maximum of 5 values are allowed per
+   * A maximum of 20 values are allowed per
    * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
    * encoded string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
@@ -1690,7 +1694,7 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    * <pre>
    * The pattern or graphic print of the product. For example, "striped", "polka
    * dot", "paisley".
-   * A maximum of 5 values are allowed per
+   * A maximum of 20 values are allowed per
    * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
    * encoded string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
@@ -1711,7 +1715,7 @@ com.google.cloud.retail.v2.CustomAttribute getAttributesOrDefault(
    * <pre>
    * The pattern or graphic print of the product. For example, "striped", "polka
    * dot", "paisley".
-   * A maximum of 5 values are allowed per
+   * A maximum of 20 values are allowed per
    * [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
    * encoded string with a length limit of 128 characters. Otherwise, an
    * INVALID_ARGUMENT error is returned.
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java
index 0b11522e..7279612b 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequest.java
@@ -6589,10 +6589,9 @@ public interface ConditionBoostSpecOrBuilder
        * Examples:
        * * To boost products with product ID "product_1" or "product_2", and
        * color
-       *   "Red" or "Blue":&lt;br&gt;
-       *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
-       *   *AND&lt;br&gt;*
-       *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
+       *   "Red" or "Blue":
+       *     * (id: ANY("product_1", "product_2")) AND (colorFamilies:
+       *     ANY("Red","Blue"))
        * </pre>
        *
        * <code>string condition = 1;</code>
@@ -6611,10 +6610,9 @@ public interface ConditionBoostSpecOrBuilder
        * Examples:
        * * To boost products with product ID "product_1" or "product_2", and
        * color
-       *   "Red" or "Blue":&lt;br&gt;
-       *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
-       *   *AND&lt;br&gt;*
-       *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
+       *   "Red" or "Blue":
+       *     * (id: ANY("product_1", "product_2")) AND (colorFamilies:
+       *     ANY("Red","Blue"))
        * </pre>
        *
        * <code>string condition = 1;</code>
@@ -6762,10 +6760,9 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
        * Examples:
        * * To boost products with product ID "product_1" or "product_2", and
        * color
-       *   "Red" or "Blue":&lt;br&gt;
-       *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
-       *   *AND&lt;br&gt;*
-       *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
+       *   "Red" or "Blue":
+       *     * (id: ANY("product_1", "product_2")) AND (colorFamilies:
+       *     ANY("Red","Blue"))
        * </pre>
        *
        * <code>string condition = 1;</code>
@@ -6795,10 +6792,9 @@ public java.lang.String getCondition() {
        * Examples:
        * * To boost products with product ID "product_1" or "product_2", and
        * color
-       *   "Red" or "Blue":&lt;br&gt;
-       *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
-       *   *AND&lt;br&gt;*
-       *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
+       *   "Red" or "Blue":
+       *     * (id: ANY("product_1", "product_2")) AND (colorFamilies:
+       *     ANY("Red","Blue"))
        * </pre>
        *
        * <code>string condition = 1;</code>
@@ -7215,10 +7211,9 @@ public Builder mergeFrom(
          * Examples:
          * * To boost products with product ID "product_1" or "product_2", and
          * color
-         *   "Red" or "Blue":&lt;br&gt;
-         *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
-         *   *AND&lt;br&gt;*
-         *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
+         *   "Red" or "Blue":
+         *     * (id: ANY("product_1", "product_2")) AND (colorFamilies:
+         *     ANY("Red","Blue"))
          * </pre>
          *
          * <code>string condition = 1;</code>
@@ -7247,10 +7242,9 @@ public java.lang.String getCondition() {
          * Examples:
          * * To boost products with product ID "product_1" or "product_2", and
          * color
-         *   "Red" or "Blue":&lt;br&gt;
-         *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
-         *   *AND&lt;br&gt;*
-         *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
+         *   "Red" or "Blue":
+         *     * (id: ANY("product_1", "product_2")) AND (colorFamilies:
+         *     ANY("Red","Blue"))
          * </pre>
          *
          * <code>string condition = 1;</code>
@@ -7279,10 +7273,9 @@ public com.google.protobuf.ByteString getConditionBytes() {
          * Examples:
          * * To boost products with product ID "product_1" or "product_2", and
          * color
-         *   "Red" or "Blue":&lt;br&gt;
-         *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
-         *   *AND&lt;br&gt;*
-         *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
+         *   "Red" or "Blue":
+         *     * (id: ANY("product_1", "product_2")) AND (colorFamilies:
+         *     ANY("Red","Blue"))
          * </pre>
          *
          * <code>string condition = 1;</code>
@@ -7310,10 +7303,9 @@ public Builder setCondition(java.lang.String value) {
          * Examples:
          * * To boost products with product ID "product_1" or "product_2", and
          * color
-         *   "Red" or "Blue":&lt;br&gt;
-         *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
-         *   *AND&lt;br&gt;*
-         *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
+         *   "Red" or "Blue":
+         *     * (id: ANY("product_1", "product_2")) AND (colorFamilies:
+         *     ANY("Red","Blue"))
          * </pre>
          *
          * <code>string condition = 1;</code>
@@ -7337,10 +7329,9 @@ public Builder clearCondition() {
          * Examples:
          * * To boost products with product ID "product_1" or "product_2", and
          * color
-         *   "Red" or "Blue":&lt;br&gt;
-         *   *(id: ANY("product_1", "product_2"))&lt;br&gt;*
-         *   *AND&lt;br&gt;*
-         *   *(colorFamilies: ANY("Red", "Blue"))&lt;br&gt;*
+         *   "Red" or "Blue":
+         *     * (id: ANY("product_1", "product_2")) AND (colorFamilies:
+         *     ANY("Red","Blue"))
          * </pre>
          *
          * <code>string condition = 1;</code>
@@ -9817,8 +9808,7 @@ public int getOffset() {
    * <pre>
    * The filter syntax consists of an expression language for constructing a
    * predicate from one or more fields of the products being filtered. Filter
-   * expression is case-sensitive. See more details at this [user
-   * guide](/retail/private/docs/filter-and-order#filter).
+   * expression is case-sensitive.
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -9844,8 +9834,7 @@ public java.lang.String getFilter() {
    * <pre>
    * The filter syntax consists of an expression language for constructing a
    * predicate from one or more fields of the products being filtered. Filter
-   * expression is case-sensitive. See more details at this [user
-   * guide](/retail/private/docs/filter-and-order#filter).
+   * expression is case-sensitive.
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -9937,9 +9926,7 @@ public com.google.protobuf.ByteString getCanonicalFilterBytes() {
    * <pre>
    * The order in which products are returned. Products can be ordered by
    * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-   * unset if ordered by relevance. OrderBy expression is case-sensitive. See
-   * more details at this [user
-   * guide](/retail/private/docs/filter-and-order#order).
+   * unset if ordered by relevance. OrderBy expression is case-sensitive.
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -9965,9 +9952,7 @@ public java.lang.String getOrderBy() {
    * <pre>
    * The order in which products are returned. Products can be ordered by
    * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-   * unset if ordered by relevance. OrderBy expression is case-sensitive. See
-   * more details at this [user
-   * guide](/retail/private/docs/filter-and-order#order).
+   * unset if ordered by relevance. OrderBy expression is case-sensitive.
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -10132,8 +10117,7 @@ public com.google.cloud.retail.v2.SearchRequest.DynamicFacetSpec getDynamicFacet
    *
    *
    * <pre>
-   * Boost specification to boost certain products. See more details at this
-   * [user guide](/retail/private/docs/boosting).
+   * Boost specification to boost certain products.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -10148,8 +10132,7 @@ public boolean hasBoostSpec() {
    *
    *
    * <pre>
-   * Boost specification to boost certain products. See more details at this
-   * [user guide](/retail/private/docs/boosting).
+   * Boost specification to boost certain products.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -10166,8 +10149,7 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpec getBoostSpec() {
    *
    *
    * <pre>
-   * Boost specification to boost certain products. See more details at this
-   * [user guide](/retail/private/docs/boosting).
+   * Boost specification to boost certain products.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -10184,8 +10166,7 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpecOrBuilder getBoostSpecO
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur. See more details at this [user
-   * guide](/retail/private/docs/result-size#query_expansion).
+   * query expansion will occur.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -10202,8 +10183,7 @@ public boolean hasQueryExpansionSpec() {
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur. See more details at this [user
-   * guide](/retail/private/docs/result-size#query_expansion).
+   * query expansion will occur.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -10222,8 +10202,7 @@ public com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec getQueryExpan
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur. See more details at this [user
-   * guide](/retail/private/docs/result-size#query_expansion).
+   * query expansion will occur.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -12266,8 +12245,7 @@ public Builder clearOffset() {
      * <pre>
      * The filter syntax consists of an expression language for constructing a
      * predicate from one or more fields of the products being filtered. Filter
-     * expression is case-sensitive. See more details at this [user
-     * guide](/retail/private/docs/filter-and-order#filter).
+     * expression is case-sensitive.
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12292,8 +12270,7 @@ public java.lang.String getFilter() {
      * <pre>
      * The filter syntax consists of an expression language for constructing a
      * predicate from one or more fields of the products being filtered. Filter
-     * expression is case-sensitive. See more details at this [user
-     * guide](/retail/private/docs/filter-and-order#filter).
+     * expression is case-sensitive.
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12318,8 +12295,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
      * <pre>
      * The filter syntax consists of an expression language for constructing a
      * predicate from one or more fields of the products being filtered. Filter
-     * expression is case-sensitive. See more details at this [user
-     * guide](/retail/private/docs/filter-and-order#filter).
+     * expression is case-sensitive.
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12343,8 +12319,7 @@ public Builder setFilter(java.lang.String value) {
      * <pre>
      * The filter syntax consists of an expression language for constructing a
      * predicate from one or more fields of the products being filtered. Filter
-     * expression is case-sensitive. See more details at this [user
-     * guide](/retail/private/docs/filter-and-order#filter).
+     * expression is case-sensitive.
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12364,8 +12339,7 @@ public Builder clearFilter() {
      * <pre>
      * The filter syntax consists of an expression language for constructing a
      * predicate from one or more fields of the products being filtered. Filter
-     * expression is case-sensitive. See more details at this [user
-     * guide](/retail/private/docs/filter-and-order#filter).
+     * expression is case-sensitive.
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12533,9 +12507,7 @@ public Builder setCanonicalFilterBytes(com.google.protobuf.ByteString value) {
      * <pre>
      * The order in which products are returned. Products can be ordered by
      * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-     * unset if ordered by relevance. OrderBy expression is case-sensitive. See
-     * more details at this [user
-     * guide](/retail/private/docs/filter-and-order#order).
+     * unset if ordered by relevance. OrderBy expression is case-sensitive.
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12560,9 +12532,7 @@ public java.lang.String getOrderBy() {
      * <pre>
      * The order in which products are returned. Products can be ordered by
      * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-     * unset if ordered by relevance. OrderBy expression is case-sensitive. See
-     * more details at this [user
-     * guide](/retail/private/docs/filter-and-order#order).
+     * unset if ordered by relevance. OrderBy expression is case-sensitive.
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12587,9 +12557,7 @@ public com.google.protobuf.ByteString getOrderByBytes() {
      * <pre>
      * The order in which products are returned. Products can be ordered by
      * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-     * unset if ordered by relevance. OrderBy expression is case-sensitive. See
-     * more details at this [user
-     * guide](/retail/private/docs/filter-and-order#order).
+     * unset if ordered by relevance. OrderBy expression is case-sensitive.
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12613,9 +12581,7 @@ public Builder setOrderBy(java.lang.String value) {
      * <pre>
      * The order in which products are returned. Products can be ordered by
      * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-     * unset if ordered by relevance. OrderBy expression is case-sensitive. See
-     * more details at this [user
-     * guide](/retail/private/docs/filter-and-order#order).
+     * unset if ordered by relevance. OrderBy expression is case-sensitive.
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -12635,9 +12601,7 @@ public Builder clearOrderBy() {
      * <pre>
      * The order in which products are returned. Products can be ordered by
      * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-     * unset if ordered by relevance. OrderBy expression is case-sensitive. See
-     * more details at this [user
-     * guide](/retail/private/docs/filter-and-order#order).
+     * unset if ordered by relevance. OrderBy expression is case-sensitive.
      * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
      * </pre>
      *
@@ -13279,8 +13243,7 @@ public Builder clearDynamicFacetSpec() {
      *
      *
      * <pre>
-     * Boost specification to boost certain products. See more details at this
-     * [user guide](/retail/private/docs/boosting).
+     * Boost specification to boost certain products.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13294,8 +13257,7 @@ public boolean hasBoostSpec() {
      *
      *
      * <pre>
-     * Boost specification to boost certain products. See more details at this
-     * [user guide](/retail/private/docs/boosting).
+     * Boost specification to boost certain products.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13315,8 +13277,7 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpec getBoostSpec() {
      *
      *
      * <pre>
-     * Boost specification to boost certain products. See more details at this
-     * [user guide](/retail/private/docs/boosting).
+     * Boost specification to boost certain products.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13338,8 +13299,7 @@ public Builder setBoostSpec(com.google.cloud.retail.v2.SearchRequest.BoostSpec v
      *
      *
      * <pre>
-     * Boost specification to boost certain products. See more details at this
-     * [user guide](/retail/private/docs/boosting).
+     * Boost specification to boost certain products.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13359,8 +13319,7 @@ public Builder setBoostSpec(
      *
      *
      * <pre>
-     * Boost specification to boost certain products. See more details at this
-     * [user guide](/retail/private/docs/boosting).
+     * Boost specification to boost certain products.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13386,8 +13345,7 @@ public Builder mergeBoostSpec(com.google.cloud.retail.v2.SearchRequest.BoostSpec
      *
      *
      * <pre>
-     * Boost specification to boost certain products. See more details at this
-     * [user guide](/retail/private/docs/boosting).
+     * Boost specification to boost certain products.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13407,8 +13365,7 @@ public Builder clearBoostSpec() {
      *
      *
      * <pre>
-     * Boost specification to boost certain products. See more details at this
-     * [user guide](/retail/private/docs/boosting).
+     * Boost specification to boost certain products.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13422,8 +13379,7 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpec.Builder getBoostSpecBu
      *
      *
      * <pre>
-     * Boost specification to boost certain products. See more details at this
-     * [user guide](/retail/private/docs/boosting).
+     * Boost specification to boost certain products.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13441,8 +13397,7 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpecOrBuilder getBoostSpecO
      *
      *
      * <pre>
-     * Boost specification to boost certain products. See more details at this
-     * [user guide](/retail/private/docs/boosting).
+     * Boost specification to boost certain products.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -13475,8 +13430,7 @@ public com.google.cloud.retail.v2.SearchRequest.BoostSpecOrBuilder getBoostSpecO
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur. See more details at this [user
-     * guide](/retail/private/docs/result-size#query_expansion).
+     * query expansion will occur.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13492,8 +13446,7 @@ public boolean hasQueryExpansionSpec() {
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur. See more details at this [user
-     * guide](/retail/private/docs/result-size#query_expansion).
+     * query expansion will occur.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13515,8 +13468,7 @@ public com.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec getQueryExpan
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur. See more details at this [user
-     * guide](/retail/private/docs/result-size#query_expansion).
+     * query expansion will occur.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13541,8 +13493,7 @@ public Builder setQueryExpansionSpec(
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur. See more details at this [user
-     * guide](/retail/private/docs/result-size#query_expansion).
+     * query expansion will occur.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13564,8 +13515,7 @@ public Builder setQueryExpansionSpec(
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur. See more details at this [user
-     * guide](/retail/private/docs/result-size#query_expansion).
+     * query expansion will occur.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13595,8 +13545,7 @@ public Builder mergeQueryExpansionSpec(
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur. See more details at this [user
-     * guide](/retail/private/docs/result-size#query_expansion).
+     * query expansion will occur.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13618,8 +13567,7 @@ public Builder clearQueryExpansionSpec() {
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur. See more details at this [user
-     * guide](/retail/private/docs/result-size#query_expansion).
+     * query expansion will occur.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13636,8 +13584,7 @@ public Builder clearQueryExpansionSpec() {
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur. See more details at this [user
-     * guide](/retail/private/docs/result-size#query_expansion).
+     * query expansion will occur.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -13658,8 +13605,7 @@ public Builder clearQueryExpansionSpec() {
      *
      * <pre>
      * The query expansion specification that specifies the conditions under which
-     * query expansion will occur. See more details at this [user
-     * guide](/retail/private/docs/result-size#query_expansion).
+     * query expansion will occur.
      * </pre>
      *
      * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
diff --git a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java
index c227b66e..de18fb45 100644
--- a/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java
+++ b/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/SearchRequestOrBuilder.java
@@ -265,8 +265,7 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The filter syntax consists of an expression language for constructing a
    * predicate from one or more fields of the products being filtered. Filter
-   * expression is case-sensitive. See more details at this [user
-   * guide](/retail/private/docs/filter-and-order#filter).
+   * expression is case-sensitive.
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -281,8 +280,7 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The filter syntax consists of an expression language for constructing a
    * predicate from one or more fields of the products being filtered. Filter
-   * expression is case-sensitive. See more details at this [user
-   * guide](/retail/private/docs/filter-and-order#filter).
+   * expression is case-sensitive.
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -337,9 +335,7 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The order in which products are returned. Products can be ordered by
    * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-   * unset if ordered by relevance. OrderBy expression is case-sensitive. See
-   * more details at this [user
-   * guide](/retail/private/docs/filter-and-order#order).
+   * unset if ordered by relevance. OrderBy expression is case-sensitive.
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -354,9 +350,7 @@ public interface SearchRequestOrBuilder
    * <pre>
    * The order in which products are returned. Products can be ordered by
    * a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-   * unset if ordered by relevance. OrderBy expression is case-sensitive. See
-   * more details at this [user
-   * guide](/retail/private/docs/filter-and-order#order).
+   * unset if ordered by relevance. OrderBy expression is case-sensitive.
    * If this field is unrecognizable, an INVALID_ARGUMENT is returned.
    * </pre>
    *
@@ -476,8 +470,7 @@ public interface SearchRequestOrBuilder
    *
    *
    * <pre>
-   * Boost specification to boost certain products. See more details at this
-   * [user guide](/retail/private/docs/boosting).
+   * Boost specification to boost certain products.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -489,8 +482,7 @@ public interface SearchRequestOrBuilder
    *
    *
    * <pre>
-   * Boost specification to boost certain products. See more details at this
-   * [user guide](/retail/private/docs/boosting).
+   * Boost specification to boost certain products.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -502,8 +494,7 @@ public interface SearchRequestOrBuilder
    *
    *
    * <pre>
-   * Boost specification to boost certain products. See more details at this
-   * [user guide](/retail/private/docs/boosting).
+   * Boost specification to boost certain products.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.BoostSpec boost_spec = 13;</code>
@@ -515,8 +506,7 @@ public interface SearchRequestOrBuilder
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur. See more details at this [user
-   * guide](/retail/private/docs/result-size#query_expansion).
+   * query expansion will occur.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -530,8 +520,7 @@ public interface SearchRequestOrBuilder
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur. See more details at this [user
-   * guide](/retail/private/docs/result-size#query_expansion).
+   * query expansion will occur.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
@@ -545,8 +534,7 @@ public interface SearchRequestOrBuilder
    *
    * <pre>
    * The query expansion specification that specifies the conditions under which
-   * query expansion will occur. See more details at this [user
-   * guide](/retail/private/docs/result-size#query_expansion).
+   * query expansion will occur.
    * </pre>
    *
    * <code>.google.cloud.retail.v2.SearchRequest.QueryExpansionSpec query_expansion_spec = 14;
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product.proto
index eaefca4c..2c411078 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/product.proto
@@ -200,6 +200,9 @@ message Product {
   // This field must be a UTF-8 encoded string with a length limit of 128
   // characters. Otherwise, an INVALID_ARGUMENT error is returned.
   //
+  // This field must be a Unigram. Otherwise, an INVALID_ARGUMENT error is
+  // returned.
+  //
   // Google Merchant Center property
   // [gtin](https://support.google.com/merchants/answer/6324461).
   // Schema.org property
@@ -434,7 +437,7 @@ message Product {
   // The pattern or graphic print of the product. For example, "striped", "polka
   // dot", "paisley".
   //
-  // A maximum of 5 values are allowed per
+  // A maximum of 20 values are allowed per
   // [Product][google.cloud.retail.v2.Product]. Each value must be a UTF-8
   // encoded string with a length limit of 128 characters. Otherwise, an
   // INVALID_ARGUMENT error is returned.
diff --git a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto
index acc6010c..38ccb464 100644
--- a/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto
+++ b/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/search_service.proto
@@ -289,10 +289,9 @@ message SearchRequest {
       //
       // * To boost products with product ID "product_1" or "product_2", and
       // color
-      //   "Red" or "Blue":<br>
-      //   *(id: ANY("product_1", "product_2"))<br>*
-      //   *AND<br>*
-      //   *(colorFamilies: ANY("Red", "Blue"))<br>*
+      //   "Red" or "Blue":
+      //     * (id: ANY("product_1", "product_2")) AND (colorFamilies:
+      //     ANY("Red","Blue"))
       string condition = 1;
 
       // Strength of the condition boost, which should be in [-1, 1]. Negative
@@ -414,8 +413,7 @@ message SearchRequest {
 
   // The filter syntax consists of an expression language for constructing a
   // predicate from one or more fields of the products being filtered. Filter
-  // expression is case-sensitive. See more details at this [user
-  // guide](/retail/private/docs/filter-and-order#filter).
+  // expression is case-sensitive.
   //
   // If this field is unrecognizable, an INVALID_ARGUMENT is returned.
   string filter = 10;
@@ -433,9 +431,7 @@ message SearchRequest {
 
   // The order in which products are returned. Products can be ordered by
   // a field in an [Product][google.cloud.retail.v2.Product] object. Leave it
-  // unset if ordered by relevance. OrderBy expression is case-sensitive. See
-  // more details at this [user
-  // guide](/retail/private/docs/filter-and-order#order).
+  // unset if ordered by relevance. OrderBy expression is case-sensitive.
   //
   // If this field is unrecognizable, an INVALID_ARGUMENT is returned.
   string order_by = 11;
@@ -453,13 +449,11 @@ message SearchRequest {
   // support team if you are interested in using dynamic facet feature.
   DynamicFacetSpec dynamic_facet_spec = 21;
 
-  // Boost specification to boost certain products. See more details at this
-  // [user guide](/retail/private/docs/boosting).
+  // Boost specification to boost certain products.
   BoostSpec boost_spec = 13;
 
   // The query expansion specification that specifies the conditions under which
-  // query expansion will occur. See more details at this [user
-  // guide](/retail/private/docs/result-size#query_expansion).
+  // query expansion will occur.
   QueryExpansionSpec query_expansion_spec = 14;
 
   // The keys to fetch and rollup the matching
diff --git a/synth.metadata b/synth.metadata
index 3d3a2811..d037c25b 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,8 +11,8 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "62d50355dff115d1b566a77bbcd6ae087fb470c0",
-        "internalRef": "391605108"
+        "sha": "cb637a6db2a0e406d656055a286ad921134c7d57",
+        "internalRef": "392712211"
       }
     },
     {