diff --git a/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictRequest.java b/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictRequest.java
index 6e705aa93a4..278cca329ca 100644
--- a/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictRequest.java
+++ b/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictRequest.java
@@ -391,7 +391,7 @@ public int getPageSize() {
    * <code>string page_token = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.retail.v2.PredictRequest.page_token is deprecated. See
-   *     google/cloud/retail/v2/prediction_service.proto;l=94
+   *     google/cloud/retail/v2/prediction_service.proto;l=93
    * @return The pageToken.
    */
   @java.lang.Override
@@ -417,7 +417,7 @@ public java.lang.String getPageToken() {
    * <code>string page_token = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.retail.v2.PredictRequest.page_token is deprecated. See
-   *     google/cloud/retail/v2/prediction_service.proto;l=94
+   *     google/cloud/retail/v2/prediction_service.proto;l=93
    * @return The bytes for pageToken.
    */
   @java.lang.Override
@@ -1936,7 +1936,7 @@ public Builder clearPageSize() {
      * <code>string page_token = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.retail.v2.PredictRequest.page_token is deprecated. See
-     *     google/cloud/retail/v2/prediction_service.proto;l=94
+     *     google/cloud/retail/v2/prediction_service.proto;l=93
      * @return The pageToken.
      */
     @java.lang.Deprecated
@@ -1961,7 +1961,7 @@ public java.lang.String getPageToken() {
      * <code>string page_token = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.retail.v2.PredictRequest.page_token is deprecated. See
-     *     google/cloud/retail/v2/prediction_service.proto;l=94
+     *     google/cloud/retail/v2/prediction_service.proto;l=93
      * @return The bytes for pageToken.
      */
     @java.lang.Deprecated
@@ -1986,7 +1986,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * <code>string page_token = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.retail.v2.PredictRequest.page_token is deprecated. See
-     *     google/cloud/retail/v2/prediction_service.proto;l=94
+     *     google/cloud/retail/v2/prediction_service.proto;l=93
      * @param value The pageToken to set.
      * @return This builder for chaining.
      */
@@ -2010,7 +2010,7 @@ public Builder setPageToken(java.lang.String value) {
      * <code>string page_token = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.retail.v2.PredictRequest.page_token is deprecated. See
-     *     google/cloud/retail/v2/prediction_service.proto;l=94
+     *     google/cloud/retail/v2/prediction_service.proto;l=93
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
@@ -2030,7 +2030,7 @@ public Builder clearPageToken() {
      * <code>string page_token = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.retail.v2.PredictRequest.page_token is deprecated. See
-     *     google/cloud/retail/v2/prediction_service.proto;l=94
+     *     google/cloud/retail/v2/prediction_service.proto;l=93
      * @param value The bytes for pageToken to set.
      * @return This builder for chaining.
      */
diff --git a/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictRequestOrBuilder.java b/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictRequestOrBuilder.java
index af9af73cf7c..4f0080b8f9e 100644
--- a/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictRequestOrBuilder.java
+++ b/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictRequestOrBuilder.java
@@ -175,7 +175,7 @@ public interface PredictRequestOrBuilder
    * <code>string page_token = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.retail.v2.PredictRequest.page_token is deprecated. See
-   *     google/cloud/retail/v2/prediction_service.proto;l=94
+   *     google/cloud/retail/v2/prediction_service.proto;l=93
    * @return The pageToken.
    */
   @java.lang.Deprecated
@@ -190,7 +190,7 @@ public interface PredictRequestOrBuilder
    * <code>string page_token = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.retail.v2.PredictRequest.page_token is deprecated. See
-   *     google/cloud/retail/v2/prediction_service.proto;l=94
+   *     google/cloud/retail/v2/prediction_service.proto;l=93
    * @return The bytes for pageToken.
    */
   @java.lang.Deprecated
diff --git a/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictionServiceProto.java b/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictionServiceProto.java
index 15a908a5d75..9c13492d1ce 100644
--- a/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictionServiceProto.java
+++ b/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/PredictionServiceProto.java
@@ -64,43 +64,43 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ice.proto\022\026google.cloud.retail.v2\032\034googl"
           + "e/api/annotations.proto\032\027google/api/clie"
           + "nt.proto\032\037google/api/field_behavior.prot"
-          + "o\032\031google/api/resource.proto\032\'google/clo"
-          + "ud/retail/v2/user_event.proto\032\034google/pr"
-          + "otobuf/struct.proto\"\264\003\n\016PredictRequest\022\026"
-          + "\n\tplacement\030\001 \001(\tB\003\340A\002\022:\n\nuser_event\030\002 \001"
-          + "(\0132!.google.cloud.retail.v2.UserEventB\003\340"
-          + "A\002\022\021\n\tpage_size\030\003 \001(\005\022\026\n\npage_token\030\004 \001("
-          + "\tB\002\030\001\022\016\n\006filter\030\005 \001(\t\022\025\n\rvalidate_only\030\006"
-          + " \001(\010\022B\n\006params\030\007 \003(\01322.google.cloud.reta"
-          + "il.v2.PredictRequest.ParamsEntry\022B\n\006labe"
-          + "ls\030\010 \003(\01322.google.cloud.retail.v2.Predic"
-          + "tRequest.LabelsEntry\032E\n\013ParamsEntry\022\013\n\003k"
-          + "ey\030\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.google.protobu"
-          + "f.Value:\0028\001\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022"
-          + "\r\n\005value\030\002 \001(\t:\0028\001\"\347\002\n\017PredictResponse\022I"
-          + "\n\007results\030\001 \003(\01328.google.cloud.retail.v2"
-          + ".PredictResponse.PredictionResult\022\031\n\021att"
-          + "ribution_token\030\002 \001(\t\022\023\n\013missing_ids\030\003 \003("
-          + "\t\022\025\n\rvalidate_only\030\004 \001(\010\032\301\001\n\020PredictionR"
-          + "esult\022\n\n\002id\030\001 \001(\t\022X\n\010metadata\030\002 \003(\0132F.go"
-          + "ogle.cloud.retail.v2.PredictResponse.Pre"
-          + "dictionResult.MetadataEntry\032G\n\rMetadataE"
-          + "ntry\022\013\n\003key\030\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.googl"
-          + "e.protobuf.Value:\0028\0012\341\002\n\021PredictionServi"
-          + "ce\022\200\002\n\007Predict\022&.google.cloud.retail.v2."
-          + "PredictRequest\032\'.google.cloud.retail.v2."
-          + "PredictResponse\"\243\001\202\323\344\223\002\234\001\"F/v2/{placemen"
-          + "t=projects/*/locations/*/catalogs/*/plac"
-          + "ements/*}:predict:\001*ZO\"J/v2/{placement=p"
-          + "rojects/*/locations/*/catalogs/*/serving"
-          + "Configs/*}:predict:\001*\032I\312A\025retail.googlea"
-          + "pis.com\322A.https://www.googleapis.com/aut"
-          + "h/cloud-platformB\313\001\n\032com.google.cloud.re"
-          + "tail.v2B\026PredictionServiceProtoP\001Z<googl"
-          + "e.golang.org/genproto/googleapis/cloud/r"
-          + "etail/v2;retail\242\002\006RETAIL\252\002\026Google.Cloud."
-          + "Retail.V2\312\002\026Google\\Cloud\\Retail\\V2\352\002\031Goo"
-          + "gle::Cloud::Retail::V2b\006proto3"
+          + "o\032\'google/cloud/retail/v2/user_event.pro"
+          + "to\032\034google/protobuf/struct.proto\"\264\003\n\016Pre"
+          + "dictRequest\022\026\n\tplacement\030\001 \001(\tB\003\340A\002\022:\n\nu"
+          + "ser_event\030\002 \001(\0132!.google.cloud.retail.v2"
+          + ".UserEventB\003\340A\002\022\021\n\tpage_size\030\003 \001(\005\022\026\n\npa"
+          + "ge_token\030\004 \001(\tB\002\030\001\022\016\n\006filter\030\005 \001(\t\022\025\n\rva"
+          + "lidate_only\030\006 \001(\010\022B\n\006params\030\007 \003(\01322.goog"
+          + "le.cloud.retail.v2.PredictRequest.Params"
+          + "Entry\022B\n\006labels\030\010 \003(\01322.google.cloud.ret"
+          + "ail.v2.PredictRequest.LabelsEntry\032E\n\013Par"
+          + "amsEntry\022\013\n\003key\030\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.g"
+          + "oogle.protobuf.Value:\0028\001\032-\n\013LabelsEntry\022"
+          + "\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\347\002\n\017Pred"
+          + "ictResponse\022I\n\007results\030\001 \003(\01328.google.cl"
+          + "oud.retail.v2.PredictResponse.Prediction"
+          + "Result\022\031\n\021attribution_token\030\002 \001(\t\022\023\n\013mis"
+          + "sing_ids\030\003 \003(\t\022\025\n\rvalidate_only\030\004 \001(\010\032\301\001"
+          + "\n\020PredictionResult\022\n\n\002id\030\001 \001(\t\022X\n\010metada"
+          + "ta\030\002 \003(\0132F.google.cloud.retail.v2.Predic"
+          + "tResponse.PredictionResult.MetadataEntry"
+          + "\032G\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022%\n\005value\030"
+          + "\002 \001(\0132\026.google.protobuf.Value:\0028\0012\341\002\n\021Pr"
+          + "edictionService\022\200\002\n\007Predict\022&.google.clo"
+          + "ud.retail.v2.PredictRequest\032\'.google.clo"
+          + "ud.retail.v2.PredictResponse\"\243\001\202\323\344\223\002\234\001\"F"
+          + "/v2/{placement=projects/*/locations/*/ca"
+          + "talogs/*/placements/*}:predict:\001*ZO\"J/v2"
+          + "/{placement=projects/*/locations/*/catal"
+          + "ogs/*/servingConfigs/*}:predict:\001*\032I\312A\025r"
+          + "etail.googleapis.com\322A.https://www.googl"
+          + "eapis.com/auth/cloud-platformB\313\001\n\032com.go"
+          + "ogle.cloud.retail.v2B\026PredictionServiceP"
+          + "rotoP\001Z<google.golang.org/genproto/googl"
+          + "eapis/cloud/retail/v2;retail\242\002\006RETAIL\252\002\026"
+          + "Google.Cloud.Retail.V2\312\002\026Google\\Cloud\\Re"
+          + "tail\\V2\352\002\031Google::Cloud::Retail::V2b\006pro"
+          + "to3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -109,7 +109,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               com.google.api.AnnotationsProto.getDescriptor(),
               com.google.api.ClientProto.getDescriptor(),
               com.google.api.FieldBehaviorProto.getDescriptor(),
-              com.google.api.ResourceProto.getDescriptor(),
               com.google.cloud.retail.v2.UserEventProto.getDescriptor(),
               com.google.protobuf.StructProto.getDescriptor(),
             });
@@ -181,7 +180,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.api.AnnotationsProto.getDescriptor();
     com.google.api.ClientProto.getDescriptor();
     com.google.api.FieldBehaviorProto.getDescriptor();
-    com.google.api.ResourceProto.getDescriptor();
     com.google.cloud.retail.v2.UserEventProto.getDescriptor();
     com.google.protobuf.StructProto.getDescriptor();
   }
diff --git a/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/UserEventServiceProto.java b/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/UserEventServiceProto.java
index 66c3bdb0c5e..e3df490c1cc 100644
--- a/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/UserEventServiceProto.java
+++ b/java-retail/proto-google-cloud-retail-v2/src/main/java/com/google/cloud/retail/v2/UserEventServiceProto.java
@@ -60,62 +60,61 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ice.proto\022\026google.cloud.retail.v2\032\034googl"
           + "e/api/annotations.proto\032\027google/api/clie"
           + "nt.proto\032\037google/api/field_behavior.prot"
-          + "o\032\031google/api/httpbody.proto\032\031google/api"
-          + "/resource.proto\032*google/cloud/retail/v2/"
-          + "import_config.proto\032)google/cloud/retail"
-          + "/v2/purge_config.proto\032\'google/cloud/ret"
-          + "ail/v2/user_event.proto\032#google/longrunn"
-          + "ing/operations.proto\"h\n\025WriteUserEventRe"
-          + "quest\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022:\n\nuser_event"
-          + "\030\002 \001(\0132!.google.cloud.retail.v2.UserEven"
-          + "tB\003\340A\002\"a\n\027CollectUserEventRequest\022\023\n\006par"
-          + "ent\030\001 \001(\tB\003\340A\002\022\027\n\nuser_event\030\002 \001(\tB\003\340A\002\022"
-          + "\013\n\003uri\030\003 \001(\t\022\013\n\003ets\030\004 \001(\003\"\376\001\n\027RejoinUser"
-          + "EventsRequest\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022e\n\027us"
-          + "er_event_rejoin_scope\030\002 \001(\0162D.google.clo"
-          + "ud.retail.v2.RejoinUserEventsRequest.Use"
-          + "rEventRejoinScope\"g\n\024UserEventRejoinScop"
-          + "e\022\'\n#USER_EVENT_REJOIN_SCOPE_UNSPECIFIED"
-          + "\020\000\022\021\n\rJOINED_EVENTS\020\001\022\023\n\017UNJOINED_EVENTS"
-          + "\020\002\">\n\030RejoinUserEventsResponse\022\"\n\032rejoin"
-          + "ed_user_events_count\030\001 \001(\003\"\032\n\030RejoinUser"
-          + "EventsMetadata2\277\t\n\020UserEventService\022\267\001\n\016"
-          + "WriteUserEvent\022-.google.cloud.retail.v2."
-          + "WriteUserEventRequest\032!.google.cloud.ret"
-          + "ail.v2.UserEvent\"S\202\323\344\223\002M\"?/v2/{parent=pr"
-          + "ojects/*/locations/*/catalogs/*}/userEve"
-          + "nts:write:\nuser_event\022\244\001\n\020CollectUserEve"
-          + "nt\022/.google.cloud.retail.v2.CollectUserE"
-          + "ventRequest\032\024.google.api.HttpBody\"I\202\323\344\223\002"
-          + "C\022A/v2/{parent=projects/*/locations/*/ca"
-          + "talogs/*}/userEvents:collect\022\206\002\n\017PurgeUs"
-          + "erEvents\022..google.cloud.retail.v2.PurgeU"
+          + "o\032\031google/api/httpbody.proto\032*google/clo"
+          + "ud/retail/v2/import_config.proto\032)google"
+          + "/cloud/retail/v2/purge_config.proto\032\'goo"
+          + "gle/cloud/retail/v2/user_event.proto\032#go"
+          + "ogle/longrunning/operations.proto\"h\n\025Wri"
+          + "teUserEventRequest\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022"
+          + ":\n\nuser_event\030\002 \001(\0132!.google.cloud.retai"
+          + "l.v2.UserEventB\003\340A\002\"a\n\027CollectUserEventR"
+          + "equest\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022\027\n\nuser_even"
+          + "t\030\002 \001(\tB\003\340A\002\022\013\n\003uri\030\003 \001(\t\022\013\n\003ets\030\004 \001(\003\"\376"
+          + "\001\n\027RejoinUserEventsRequest\022\023\n\006parent\030\001 \001"
+          + "(\tB\003\340A\002\022e\n\027user_event_rejoin_scope\030\002 \001(\016"
+          + "2D.google.cloud.retail.v2.RejoinUserEven"
+          + "tsRequest.UserEventRejoinScope\"g\n\024UserEv"
+          + "entRejoinScope\022\'\n#USER_EVENT_REJOIN_SCOP"
+          + "E_UNSPECIFIED\020\000\022\021\n\rJOINED_EVENTS\020\001\022\023\n\017UN"
+          + "JOINED_EVENTS\020\002\">\n\030RejoinUserEventsRespo"
+          + "nse\022\"\n\032rejoined_user_events_count\030\001 \001(\003\""
+          + "\032\n\030RejoinUserEventsMetadata2\277\t\n\020UserEven"
+          + "tService\022\267\001\n\016WriteUserEvent\022-.google.clo"
+          + "ud.retail.v2.WriteUserEventRequest\032!.goo"
+          + "gle.cloud.retail.v2.UserEvent\"S\202\323\344\223\002M\"?/"
+          + "v2/{parent=projects/*/locations/*/catalo"
+          + "gs/*}/userEvents:write:\nuser_event\022\244\001\n\020C"
+          + "ollectUserEvent\022/.google.cloud.retail.v2"
+          + ".CollectUserEventRequest\032\024.google.api.Ht"
+          + "tpBody\"I\202\323\344\223\002C\022A/v2/{parent=projects/*/l"
+          + "ocations/*/catalogs/*}/userEvents:collec"
+          + "t\022\206\002\n\017PurgeUserEvents\022..google.cloud.ret"
+          + "ail.v2.PurgeUserEventsRequest\032\035.google.l"
+          + "ongrunning.Operation\"\243\001\202\323\344\223\002D\"?/v2/{pare"
+          + "nt=projects/*/locations/*/catalogs/*}/us"
+          + "erEvents:purge:\001*\312AV\n.google.cloud.retai"
+          + "l.v2.PurgeUserEventsResponse\022$google.clo"
+          + "ud.retail.v2.PurgeMetadata\022\213\002\n\020ImportUse"
+          + "rEvents\022/.google.cloud.retail.v2.ImportU"
           + "serEventsRequest\032\035.google.longrunning.Op"
-          + "eration\"\243\001\202\323\344\223\002D\"?/v2/{parent=projects/*"
-          + "/locations/*/catalogs/*}/userEvents:purg"
-          + "e:\001*\312AV\n.google.cloud.retail.v2.PurgeUse"
-          + "rEventsResponse\022$google.cloud.retail.v2."
-          + "PurgeMetadata\022\213\002\n\020ImportUserEvents\022/.goo"
-          + "gle.cloud.retail.v2.ImportUserEventsRequ"
-          + "est\032\035.google.longrunning.Operation\"\246\001\202\323\344"
-          + "\223\002E\"@/v2/{parent=projects/*/locations/*/"
-          + "catalogs/*}/userEvents:import:\001*\312AX\n/goo"
-          + "gle.cloud.retail.v2.ImportUserEventsResp"
-          + "onse\022%google.cloud.retail.v2.ImportMetad"
-          + "ata\022\347\001\n\020RejoinUserEvents\022/.google.cloud."
-          + "retail.v2.RejoinUserEventsRequest\032\035.goog"
-          + "le.longrunning.Operation\"\202\001\202\323\344\223\002E\"@/v2/{"
-          + "parent=projects/*/locations/*/catalogs/*"
-          + "}/userEvents:rejoin:\001*\312A4\n\030RejoinUserEve"
-          + "ntsResponse\022\030RejoinUserEventsMetadata\032I\312"
-          + "A\025retail.googleapis.com\322A.https://www.go"
-          + "ogleapis.com/auth/cloud-platformB\312\001\n\032com"
-          + ".google.cloud.retail.v2B\025UserEventServic"
-          + "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"
+          + "eration\"\246\001\202\323\344\223\002E\"@/v2/{parent=projects/*"
+          + "/locations/*/catalogs/*}/userEvents:impo"
+          + "rt:\001*\312AX\n/google.cloud.retail.v2.ImportU"
+          + "serEventsResponse\022%google.cloud.retail.v"
+          + "2.ImportMetadata\022\347\001\n\020RejoinUserEvents\022/."
+          + "google.cloud.retail.v2.RejoinUserEventsR"
+          + "equest\032\035.google.longrunning.Operation\"\202\001"
+          + "\202\323\344\223\002E\"@/v2/{parent=projects/*/locations"
+          + "/*/catalogs/*}/userEvents:rejoin:\001*\312A4\n\030"
+          + "RejoinUserEventsResponse\022\030RejoinUserEven"
+          + "tsMetadata\032I\312A\025retail.googleapis.com\322A.h"
+          + "ttps://www.googleapis.com/auth/cloud-pla"
+          + "tformB\312\001\n\032com.google.cloud.retail.v2B\025Us"
+          + "erEventServiceProtoP\001Z<google.golang.org"
+          + "/genproto/googleapis/cloud/retail/v2;ret"
+          + "ail\242\002\006RETAIL\252\002\026Google.Cloud.Retail.V2\312\002\026"
+          + "Google\\Cloud\\Retail\\V2\352\002\031Google::Cloud::"
+          + "Retail::V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -125,7 +124,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               com.google.api.ClientProto.getDescriptor(),
               com.google.api.FieldBehaviorProto.getDescriptor(),
               com.google.api.HttpBodyProto.getDescriptor(),
-              com.google.api.ResourceProto.getDescriptor(),
               com.google.cloud.retail.v2.ImportConfigProto.getDescriptor(),
               com.google.cloud.retail.v2.PurgeConfigProto.getDescriptor(),
               com.google.cloud.retail.v2.UserEventProto.getDescriptor(),
@@ -182,7 +180,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.api.ClientProto.getDescriptor();
     com.google.api.FieldBehaviorProto.getDescriptor();
     com.google.api.HttpBodyProto.getDescriptor();
-    com.google.api.ResourceProto.getDescriptor();
     com.google.cloud.retail.v2.ImportConfigProto.getDescriptor();
     com.google.cloud.retail.v2.PurgeConfigProto.getDescriptor();
     com.google.cloud.retail.v2.UserEventProto.getDescriptor();
diff --git a/java-retail/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/prediction_service.proto b/java-retail/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/prediction_service.proto
index 26eaaf130f0..717405b2b81 100644
--- a/java-retail/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/prediction_service.proto
+++ b/java-retail/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/prediction_service.proto
@@ -19,7 +19,6 @@ package google.cloud.retail.v2;
 import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
-import "google/api/resource.proto";
 import "google/cloud/retail/v2/user_event.proto";
 import "google/protobuf/struct.proto";
 
diff --git a/java-retail/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event_service.proto b/java-retail/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event_service.proto
index 4446906a21a..1b0c190df16 100644
--- a/java-retail/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event_service.proto
+++ b/java-retail/proto-google-cloud-retail-v2/src/main/proto/google/cloud/retail/v2/user_event_service.proto
@@ -20,7 +20,6 @@ import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
 import "google/api/httpbody.proto";
-import "google/api/resource.proto";
 import "google/cloud/retail/v2/import_config.proto";
 import "google/cloud/retail/v2/purge_config.proto";
 import "google/cloud/retail/v2/user_event.proto";
diff --git a/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/ExportConfigProto.java b/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/ExportConfigProto.java
index 59c3251cddc..717ce21f56c 100644
--- a/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/ExportConfigProto.java
+++ b/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/ExportConfigProto.java
@@ -62,41 +62,37 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n/google/cloud/retail/v2alpha/export_con"
           + "fig.proto\022\033google.cloud.retail.v2alpha\032\037"
-          + "google/api/field_behavior.proto\032\031google/"
-          + "api/resource.proto\032\037google/protobuf/time"
-          + "stamp.proto\032\027google/rpc/status.proto\"9\n\022"
-          + "ExportErrorsConfig\022\024\n\ngcs_prefix\030\001 \001(\tH\000"
-          + "B\r\n\013destination\"r\n\016ExportMetadata\022/\n\013cre"
-          + "ate_time\030\001 \001(\0132\032.google.protobuf.Timesta"
-          + "mp\022/\n\013update_time\030\002 \001(\0132\032.google.protobu"
-          + "f.Timestamp\"\315\001\n\026ExportProductsResponse\022)"
-          + "\n\rerror_samples\030\001 \003(\0132\022.google.rpc.Statu"
-          + "s\022F\n\rerrors_config\030\002 \001(\0132/.google.cloud."
-          + "retail.v2alpha.ExportErrorsConfig\022@\n\rout"
-          + "put_result\030\003 \001(\0132).google.cloud.retail.v"
-          + "2alpha.OutputResult\"\317\001\n\030ExportUserEvents"
-          + "Response\022)\n\rerror_samples\030\001 \003(\0132\022.google"
-          + ".rpc.Status\022F\n\rerrors_config\030\002 \001(\0132/.goo"
-          + "gle.cloud.retail.v2alpha.ExportErrorsCon"
-          + "fig\022@\n\routput_result\030\003 \001(\0132).google.clou"
-          + "d.retail.v2alpha.OutputResult\"Z\n\014OutputR"
-          + "esult\022J\n\017bigquery_result\030\001 \003(\01321.google."
-          + "cloud.retail.v2alpha.BigQueryOutputResul"
-          + "t\"<\n\024BigQueryOutputResult\022\022\n\ndataset_id\030"
-          + "\001 \001(\t\022\020\n\010table_id\030\002 \001(\tB\337\001\n\037com.google.c"
-          + "loud.retail.v2alphaB\021ExportConfigProtoP\001"
-          + "ZAgoogle.golang.org/genproto/googleapis/"
-          + "cloud/retail/v2alpha;retail\242\002\006RETAIL\252\002\033G"
-          + "oogle.Cloud.Retail.V2Alpha\312\002\033Google\\Clou"
-          + "d\\Retail\\V2alpha\352\002\036Google::Cloud::Retail"
-          + "::V2alphab\006proto3"
+          + "google/protobuf/timestamp.proto\032\027google/"
+          + "rpc/status.proto\"9\n\022ExportErrorsConfig\022\024"
+          + "\n\ngcs_prefix\030\001 \001(\tH\000B\r\n\013destination\"r\n\016E"
+          + "xportMetadata\022/\n\013create_time\030\001 \001(\0132\032.goo"
+          + "gle.protobuf.Timestamp\022/\n\013update_time\030\002 "
+          + "\001(\0132\032.google.protobuf.Timestamp\"\315\001\n\026Expo"
+          + "rtProductsResponse\022)\n\rerror_samples\030\001 \003("
+          + "\0132\022.google.rpc.Status\022F\n\rerrors_config\030\002"
+          + " \001(\0132/.google.cloud.retail.v2alpha.Expor"
+          + "tErrorsConfig\022@\n\routput_result\030\003 \001(\0132).g"
+          + "oogle.cloud.retail.v2alpha.OutputResult\""
+          + "\317\001\n\030ExportUserEventsResponse\022)\n\rerror_sa"
+          + "mples\030\001 \003(\0132\022.google.rpc.Status\022F\n\rerror"
+          + "s_config\030\002 \001(\0132/.google.cloud.retail.v2a"
+          + "lpha.ExportErrorsConfig\022@\n\routput_result"
+          + "\030\003 \001(\0132).google.cloud.retail.v2alpha.Out"
+          + "putResult\"Z\n\014OutputResult\022J\n\017bigquery_re"
+          + "sult\030\001 \003(\01321.google.cloud.retail.v2alpha"
+          + ".BigQueryOutputResult\"<\n\024BigQueryOutputR"
+          + "esult\022\022\n\ndataset_id\030\001 \001(\t\022\020\n\010table_id\030\002 "
+          + "\001(\tB\337\001\n\037com.google.cloud.retail.v2alphaB"
+          + "\021ExportConfigProtoP\001ZAgoogle.golang.org/"
+          + "genproto/googleapis/cloud/retail/v2alpha"
+          + ";retail\242\002\006RETAIL\252\002\033Google.Cloud.Retail.V"
+          + "2Alpha\312\002\033Google\\Cloud\\Retail\\V2alpha\352\002\036G"
+          + "oogle::Cloud::Retail::V2alphab\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
-              com.google.api.FieldBehaviorProto.getDescriptor(),
-              com.google.api.ResourceProto.getDescriptor(),
               com.google.protobuf.TimestampProto.getDescriptor(),
               com.google.rpc.StatusProto.getDescriptor(),
             });
@@ -148,8 +144,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "DatasetId", "TableId",
             });
-    com.google.api.FieldBehaviorProto.getDescriptor();
-    com.google.api.ResourceProto.getDescriptor();
     com.google.protobuf.TimestampProto.getDescriptor();
     com.google.rpc.StatusProto.getDescriptor();
   }
diff --git a/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictRequest.java b/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictRequest.java
index eb96c0f4163..798a661d567 100644
--- a/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictRequest.java
+++ b/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictRequest.java
@@ -391,7 +391,7 @@ public int getPageSize() {
    * <code>string page_token = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.retail.v2alpha.PredictRequest.page_token is deprecated. See
-   *     google/cloud/retail/v2alpha/prediction_service.proto;l=94
+   *     google/cloud/retail/v2alpha/prediction_service.proto;l=93
    * @return The pageToken.
    */
   @java.lang.Override
@@ -417,7 +417,7 @@ public java.lang.String getPageToken() {
    * <code>string page_token = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.retail.v2alpha.PredictRequest.page_token is deprecated. See
-   *     google/cloud/retail/v2alpha/prediction_service.proto;l=94
+   *     google/cloud/retail/v2alpha/prediction_service.proto;l=93
    * @return The bytes for pageToken.
    */
   @java.lang.Override
@@ -1936,7 +1936,7 @@ public Builder clearPageSize() {
      * <code>string page_token = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.retail.v2alpha.PredictRequest.page_token is deprecated. See
-     *     google/cloud/retail/v2alpha/prediction_service.proto;l=94
+     *     google/cloud/retail/v2alpha/prediction_service.proto;l=93
      * @return The pageToken.
      */
     @java.lang.Deprecated
@@ -1961,7 +1961,7 @@ public java.lang.String getPageToken() {
      * <code>string page_token = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.retail.v2alpha.PredictRequest.page_token is deprecated. See
-     *     google/cloud/retail/v2alpha/prediction_service.proto;l=94
+     *     google/cloud/retail/v2alpha/prediction_service.proto;l=93
      * @return The bytes for pageToken.
      */
     @java.lang.Deprecated
@@ -1986,7 +1986,7 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      * <code>string page_token = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.retail.v2alpha.PredictRequest.page_token is deprecated. See
-     *     google/cloud/retail/v2alpha/prediction_service.proto;l=94
+     *     google/cloud/retail/v2alpha/prediction_service.proto;l=93
      * @param value The pageToken to set.
      * @return This builder for chaining.
      */
@@ -2010,7 +2010,7 @@ public Builder setPageToken(java.lang.String value) {
      * <code>string page_token = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.retail.v2alpha.PredictRequest.page_token is deprecated. See
-     *     google/cloud/retail/v2alpha/prediction_service.proto;l=94
+     *     google/cloud/retail/v2alpha/prediction_service.proto;l=93
      * @return This builder for chaining.
      */
     @java.lang.Deprecated
@@ -2030,7 +2030,7 @@ public Builder clearPageToken() {
      * <code>string page_token = 4 [deprecated = true];</code>
      *
      * @deprecated google.cloud.retail.v2alpha.PredictRequest.page_token is deprecated. See
-     *     google/cloud/retail/v2alpha/prediction_service.proto;l=94
+     *     google/cloud/retail/v2alpha/prediction_service.proto;l=93
      * @param value The bytes for pageToken to set.
      * @return This builder for chaining.
      */
diff --git a/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictRequestOrBuilder.java b/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictRequestOrBuilder.java
index e9243f49b09..0adcd91df47 100644
--- a/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictRequestOrBuilder.java
+++ b/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictRequestOrBuilder.java
@@ -175,7 +175,7 @@ public interface PredictRequestOrBuilder
    * <code>string page_token = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.retail.v2alpha.PredictRequest.page_token is deprecated. See
-   *     google/cloud/retail/v2alpha/prediction_service.proto;l=94
+   *     google/cloud/retail/v2alpha/prediction_service.proto;l=93
    * @return The pageToken.
    */
   @java.lang.Deprecated
@@ -190,7 +190,7 @@ public interface PredictRequestOrBuilder
    * <code>string page_token = 4 [deprecated = true];</code>
    *
    * @deprecated google.cloud.retail.v2alpha.PredictRequest.page_token is deprecated. See
-   *     google/cloud/retail/v2alpha/prediction_service.proto;l=94
+   *     google/cloud/retail/v2alpha/prediction_service.proto;l=93
    * @return The bytes for pageToken.
    */
   @java.lang.Deprecated
diff --git a/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictionServiceProto.java b/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictionServiceProto.java
index cb5bcab8ace..97e756dae90 100644
--- a/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictionServiceProto.java
+++ b/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/PredictionServiceProto.java
@@ -64,45 +64,45 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "_service.proto\022\033google.cloud.retail.v2al"
           + "pha\032\034google/api/annotations.proto\032\027googl"
           + "e/api/client.proto\032\037google/api/field_beh"
-          + "avior.proto\032\031google/api/resource.proto\032,"
-          + "google/cloud/retail/v2alpha/user_event.p"
-          + "roto\032\034google/protobuf/struct.proto\"\303\003\n\016P"
-          + "redictRequest\022\026\n\tplacement\030\001 \001(\tB\003\340A\002\022?\n"
-          + "\nuser_event\030\002 \001(\0132&.google.cloud.retail."
-          + "v2alpha.UserEventB\003\340A\002\022\021\n\tpage_size\030\003 \001("
-          + "\005\022\026\n\npage_token\030\004 \001(\tB\002\030\001\022\016\n\006filter\030\005 \001("
-          + "\t\022\025\n\rvalidate_only\030\006 \001(\010\022G\n\006params\030\007 \003(\013"
-          + "27.google.cloud.retail.v2alpha.PredictRe"
-          + "quest.ParamsEntry\022G\n\006labels\030\010 \003(\01327.goog"
-          + "le.cloud.retail.v2alpha.PredictRequest.L"
-          + "abelsEntry\032E\n\013ParamsEntry\022\013\n\003key\030\001 \001(\t\022%"
-          + "\n\005value\030\002 \001(\0132\026.google.protobuf.Value:\0028"
-          + "\001\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002"
-          + " \001(\t:\0028\001\"\361\002\n\017PredictResponse\022N\n\007results\030"
-          + "\001 \003(\0132=.google.cloud.retail.v2alpha.Pred"
-          + "ictResponse.PredictionResult\022\031\n\021attribut"
-          + "ion_token\030\002 \001(\t\022\023\n\013missing_ids\030\003 \003(\t\022\025\n\r"
-          + "validate_only\030\004 \001(\010\032\306\001\n\020PredictionResult"
-          + "\022\n\n\002id\030\001 \001(\t\022]\n\010metadata\030\002 \003(\0132K.google."
-          + "cloud.retail.v2alpha.PredictResponse.Pre"
-          + "dictionResult.MetadataEntry\032G\n\rMetadataE"
-          + "ntry\022\013\n\003key\030\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.googl"
-          + "e.protobuf.Value:\0028\0012\365\002\n\021PredictionServi"
-          + "ce\022\224\002\n\007Predict\022+.google.cloud.retail.v2a"
-          + "lpha.PredictRequest\032,.google.cloud.retai"
-          + "l.v2alpha.PredictResponse\"\255\001\202\323\344\223\002\246\001\"K/v2"
-          + "alpha/{placement=projects/*/locations/*/"
-          + "catalogs/*/placements/*}:predict:\001*ZT\"O/"
-          + "v2alpha/{placement=projects/*/locations/"
-          + "*/catalogs/*/servingConfigs/*}:predict:\001"
-          + "*\032I\312A\025retail.googleapis.com\322A.https://ww"
-          + "w.googleapis.com/auth/cloud-platformB\344\001\n"
-          + "\037com.google.cloud.retail.v2alphaB\026Predic"
-          + "tionServiceProtoP\001ZAgoogle.golang.org/ge"
-          + "nproto/googleapis/cloud/retail/v2alpha;r"
-          + "etail\242\002\006RETAIL\252\002\033Google.Cloud.Retail.V2A"
-          + "lpha\312\002\033Google\\Cloud\\Retail\\V2alpha\352\002\036Goo"
-          + "gle::Cloud::Retail::V2alphab\006proto3"
+          + "avior.proto\032,google/cloud/retail/v2alpha"
+          + "/user_event.proto\032\034google/protobuf/struc"
+          + "t.proto\"\303\003\n\016PredictRequest\022\026\n\tplacement\030"
+          + "\001 \001(\tB\003\340A\002\022?\n\nuser_event\030\002 \001(\0132&.google."
+          + "cloud.retail.v2alpha.UserEventB\003\340A\002\022\021\n\tp"
+          + "age_size\030\003 \001(\005\022\026\n\npage_token\030\004 \001(\tB\002\030\001\022\016"
+          + "\n\006filter\030\005 \001(\t\022\025\n\rvalidate_only\030\006 \001(\010\022G\n"
+          + "\006params\030\007 \003(\01327.google.cloud.retail.v2al"
+          + "pha.PredictRequest.ParamsEntry\022G\n\006labels"
+          + "\030\010 \003(\01327.google.cloud.retail.v2alpha.Pre"
+          + "dictRequest.LabelsEntry\032E\n\013ParamsEntry\022\013"
+          + "\n\003key\030\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.google.prot"
+          + "obuf.Value:\0028\001\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001"
+          + "(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\361\002\n\017PredictRespons"
+          + "e\022N\n\007results\030\001 \003(\0132=.google.cloud.retail"
+          + ".v2alpha.PredictResponse.PredictionResul"
+          + "t\022\031\n\021attribution_token\030\002 \001(\t\022\023\n\013missing_"
+          + "ids\030\003 \003(\t\022\025\n\rvalidate_only\030\004 \001(\010\032\306\001\n\020Pre"
+          + "dictionResult\022\n\n\002id\030\001 \001(\t\022]\n\010metadata\030\002 "
+          + "\003(\0132K.google.cloud.retail.v2alpha.Predic"
+          + "tResponse.PredictionResult.MetadataEntry"
+          + "\032G\n\rMetadataEntry\022\013\n\003key\030\001 \001(\t\022%\n\005value\030"
+          + "\002 \001(\0132\026.google.protobuf.Value:\0028\0012\365\002\n\021Pr"
+          + "edictionService\022\224\002\n\007Predict\022+.google.clo"
+          + "ud.retail.v2alpha.PredictRequest\032,.googl"
+          + "e.cloud.retail.v2alpha.PredictResponse\"\255"
+          + "\001\202\323\344\223\002\246\001\"K/v2alpha/{placement=projects/*"
+          + "/locations/*/catalogs/*/placements/*}:pr"
+          + "edict:\001*ZT\"O/v2alpha/{placement=projects"
+          + "/*/locations/*/catalogs/*/servingConfigs"
+          + "/*}:predict:\001*\032I\312A\025retail.googleapis.com"
+          + "\322A.https://www.googleapis.com/auth/cloud"
+          + "-platformB\344\001\n\037com.google.cloud.retail.v2"
+          + "alphaB\026PredictionServiceProtoP\001ZAgoogle."
+          + "golang.org/genproto/googleapis/cloud/ret"
+          + "ail/v2alpha;retail\242\002\006RETAIL\252\002\033Google.Clo"
+          + "ud.Retail.V2Alpha\312\002\033Google\\Cloud\\Retail\\"
+          + "V2alpha\352\002\036Google::Cloud::Retail::V2alpha"
+          + "b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -111,7 +111,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               com.google.api.AnnotationsProto.getDescriptor(),
               com.google.api.ClientProto.getDescriptor(),
               com.google.api.FieldBehaviorProto.getDescriptor(),
-              com.google.api.ResourceProto.getDescriptor(),
               com.google.cloud.retail.v2alpha.UserEventProto.getDescriptor(),
               com.google.protobuf.StructProto.getDescriptor(),
             });
@@ -189,7 +188,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.api.AnnotationsProto.getDescriptor();
     com.google.api.ClientProto.getDescriptor();
     com.google.api.FieldBehaviorProto.getDescriptor();
-    com.google.api.ResourceProto.getDescriptor();
     com.google.cloud.retail.v2alpha.UserEventProto.getDescriptor();
     com.google.protobuf.StructProto.getDescriptor();
   }
diff --git a/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/UserEventServiceProto.java b/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/UserEventServiceProto.java
index 86d003690cc..19c30fdaad3 100644
--- a/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/UserEventServiceProto.java
+++ b/java-retail/proto-google-cloud-retail-v2alpha/src/main/java/com/google/cloud/retail/v2alpha/UserEventServiceProto.java
@@ -60,65 +60,64 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "_service.proto\022\033google.cloud.retail.v2al"
           + "pha\032\034google/api/annotations.proto\032\027googl"
           + "e/api/client.proto\032\037google/api/field_beh"
-          + "avior.proto\032\031google/api/httpbody.proto\032\031"
-          + "google/api/resource.proto\032/google/cloud/"
-          + "retail/v2alpha/import_config.proto\032.goog"
-          + "le/cloud/retail/v2alpha/purge_config.pro"
-          + "to\032,google/cloud/retail/v2alpha/user_eve"
-          + "nt.proto\032#google/longrunning/operations."
-          + "proto\"m\n\025WriteUserEventRequest\022\023\n\006parent"
-          + "\030\001 \001(\tB\003\340A\002\022?\n\nuser_event\030\002 \001(\0132&.google"
-          + ".cloud.retail.v2alpha.UserEventB\003\340A\002\"a\n\027"
-          + "CollectUserEventRequest\022\023\n\006parent\030\001 \001(\tB"
-          + "\003\340A\002\022\027\n\nuser_event\030\002 \001(\tB\003\340A\002\022\013\n\003uri\030\003 \001"
-          + "(\t\022\013\n\003ets\030\004 \001(\003\"\203\002\n\027RejoinUserEventsRequ"
-          + "est\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022j\n\027user_event_r"
-          + "ejoin_scope\030\002 \001(\0162I.google.cloud.retail."
-          + "v2alpha.RejoinUserEventsRequest.UserEven"
-          + "tRejoinScope\"g\n\024UserEventRejoinScope\022\'\n#"
-          + "USER_EVENT_REJOIN_SCOPE_UNSPECIFIED\020\000\022\021\n"
-          + "\rJOINED_EVENTS\020\001\022\023\n\017UNJOINED_EVENTS\020\002\">\n"
-          + "\030RejoinUserEventsResponse\022\"\n\032rejoined_us"
-          + "er_events_count\030\001 \001(\003\"\032\n\030RejoinUserEvent"
-          + "sMetadata2\212\n\n\020UserEventService\022\306\001\n\016Write"
-          + "UserEvent\0222.google.cloud.retail.v2alpha."
-          + "WriteUserEventRequest\032&.google.cloud.ret"
-          + "ail.v2alpha.UserEvent\"X\202\323\344\223\002R\"D/v2alpha/"
+          + "avior.proto\032\031google/api/httpbody.proto\032/"
+          + "google/cloud/retail/v2alpha/import_confi"
+          + "g.proto\032.google/cloud/retail/v2alpha/pur"
+          + "ge_config.proto\032,google/cloud/retail/v2a"
+          + "lpha/user_event.proto\032#google/longrunnin"
+          + "g/operations.proto\"m\n\025WriteUserEventRequ"
+          + "est\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022?\n\nuser_event\030\002"
+          + " \001(\0132&.google.cloud.retail.v2alpha.UserE"
+          + "ventB\003\340A\002\"a\n\027CollectUserEventRequest\022\023\n\006"
+          + "parent\030\001 \001(\tB\003\340A\002\022\027\n\nuser_event\030\002 \001(\tB\003\340"
+          + "A\002\022\013\n\003uri\030\003 \001(\t\022\013\n\003ets\030\004 \001(\003\"\203\002\n\027RejoinU"
+          + "serEventsRequest\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022j\n"
+          + "\027user_event_rejoin_scope\030\002 \001(\0162I.google."
+          + "cloud.retail.v2alpha.RejoinUserEventsReq"
+          + "uest.UserEventRejoinScope\"g\n\024UserEventRe"
+          + "joinScope\022\'\n#USER_EVENT_REJOIN_SCOPE_UNS"
+          + "PECIFIED\020\000\022\021\n\rJOINED_EVENTS\020\001\022\023\n\017UNJOINE"
+          + "D_EVENTS\020\002\">\n\030RejoinUserEventsResponse\022\""
+          + "\n\032rejoined_user_events_count\030\001 \001(\003\"\032\n\030Re"
+          + "joinUserEventsMetadata2\212\n\n\020UserEventServ"
+          + "ice\022\306\001\n\016WriteUserEvent\0222.google.cloud.re"
+          + "tail.v2alpha.WriteUserEventRequest\032&.goo"
+          + "gle.cloud.retail.v2alpha.UserEvent\"X\202\323\344\223"
+          + "\002R\"D/v2alpha/{parent=projects/*/location"
+          + "s/*/catalogs/*}/userEvents:write:\nuser_e"
+          + "vent\022\256\001\n\020CollectUserEvent\0224.google.cloud"
+          + ".retail.v2alpha.CollectUserEventRequest\032"
+          + "\024.google.api.HttpBody\"N\202\323\344\223\002H\022F/v2alpha/"
           + "{parent=projects/*/locations/*/catalogs/"
-          + "*}/userEvents:write:\nuser_event\022\256\001\n\020Coll"
-          + "ectUserEvent\0224.google.cloud.retail.v2alp"
-          + "ha.CollectUserEventRequest\032\024.google.api."
-          + "HttpBody\"N\202\323\344\223\002H\022F/v2alpha/{parent=proje"
-          + "cts/*/locations/*/catalogs/*}/userEvents"
-          + ":collect\022\232\002\n\017PurgeUserEvents\0223.google.cl"
-          + "oud.retail.v2alpha.PurgeUserEventsReques"
-          + "t\032\035.google.longrunning.Operation\"\262\001\202\323\344\223\002"
-          + "I\"D/v2alpha/{parent=projects/*/locations"
-          + "/*/catalogs/*}/userEvents:purge:\001*\312A`\n3g"
-          + "oogle.cloud.retail.v2alpha.PurgeUserEven"
-          + "tsResponse\022)google.cloud.retail.v2alpha."
-          + "PurgeMetadata\022\237\002\n\020ImportUserEvents\0224.goo"
-          + "gle.cloud.retail.v2alpha.ImportUserEvent"
-          + "sRequest\032\035.google.longrunning.Operation\""
-          + "\265\001\202\323\344\223\002J\"E/v2alpha/{parent=projects/*/lo"
-          + "cations/*/catalogs/*}/userEvents:import:"
-          + "\001*\312Ab\n4google.cloud.retail.v2alpha.Impor"
-          + "tUserEventsResponse\022*google.cloud.retail"
-          + ".v2alpha.ImportMetadata\022\361\001\n\020RejoinUserEv"
-          + "ents\0224.google.cloud.retail.v2alpha.Rejoi"
-          + "nUserEventsRequest\032\035.google.longrunning."
-          + "Operation\"\207\001\202\323\344\223\002J\"E/v2alpha/{parent=pro"
-          + "jects/*/locations/*/catalogs/*}/userEven"
-          + "ts:rejoin:\001*\312A4\n\030RejoinUserEventsRespons"
-          + "e\022\030RejoinUserEventsMetadata\032I\312A\025retail.g"
-          + "oogleapis.com\322A.https://www.googleapis.c"
-          + "om/auth/cloud-platformB\343\001\n\037com.google.cl"
-          + "oud.retail.v2alphaB\025UserEventServiceProt"
-          + "oP\001ZAgoogle.golang.org/genproto/googleap"
-          + "is/cloud/retail/v2alpha;retail\242\002\006RETAIL\252"
-          + "\002\033Google.Cloud.Retail.V2Alpha\312\002\033Google\\C"
-          + "loud\\Retail\\V2alpha\352\002\036Google::Cloud::Ret"
-          + "ail::V2alphab\006proto3"
+          + "*}/userEvents:collect\022\232\002\n\017PurgeUserEvent"
+          + "s\0223.google.cloud.retail.v2alpha.PurgeUse"
+          + "rEventsRequest\032\035.google.longrunning.Oper"
+          + "ation\"\262\001\202\323\344\223\002I\"D/v2alpha/{parent=project"
+          + "s/*/locations/*/catalogs/*}/userEvents:p"
+          + "urge:\001*\312A`\n3google.cloud.retail.v2alpha."
+          + "PurgeUserEventsResponse\022)google.cloud.re"
+          + "tail.v2alpha.PurgeMetadata\022\237\002\n\020ImportUse"
+          + "rEvents\0224.google.cloud.retail.v2alpha.Im"
+          + "portUserEventsRequest\032\035.google.longrunni"
+          + "ng.Operation\"\265\001\202\323\344\223\002J\"E/v2alpha/{parent="
+          + "projects/*/locations/*/catalogs/*}/userE"
+          + "vents:import:\001*\312Ab\n4google.cloud.retail."
+          + "v2alpha.ImportUserEventsResponse\022*google"
+          + ".cloud.retail.v2alpha.ImportMetadata\022\361\001\n"
+          + "\020RejoinUserEvents\0224.google.cloud.retail."
+          + "v2alpha.RejoinUserEventsRequest\032\035.google"
+          + ".longrunning.Operation\"\207\001\202\323\344\223\002J\"E/v2alph"
+          + "a/{parent=projects/*/locations/*/catalog"
+          + "s/*}/userEvents:rejoin:\001*\312A4\n\030RejoinUser"
+          + "EventsResponse\022\030RejoinUserEventsMetadata"
+          + "\032I\312A\025retail.googleapis.com\322A.https://www"
+          + ".googleapis.com/auth/cloud-platformB\343\001\n\037"
+          + "com.google.cloud.retail.v2alphaB\025UserEve"
+          + "ntServiceProtoP\001ZAgoogle.golang.org/genp"
+          + "roto/googleapis/cloud/retail/v2alpha;ret"
+          + "ail\242\002\006RETAIL\252\002\033Google.Cloud.Retail.V2Alp"
+          + "ha\312\002\033Google\\Cloud\\Retail\\V2alpha\352\002\036Googl"
+          + "e::Cloud::Retail::V2alphab\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -128,7 +127,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               com.google.api.ClientProto.getDescriptor(),
               com.google.api.FieldBehaviorProto.getDescriptor(),
               com.google.api.HttpBodyProto.getDescriptor(),
-              com.google.api.ResourceProto.getDescriptor(),
               com.google.cloud.retail.v2alpha.ImportConfigProto.getDescriptor(),
               com.google.cloud.retail.v2alpha.PurgeConfigProto.getDescriptor(),
               com.google.cloud.retail.v2alpha.UserEventProto.getDescriptor(),
@@ -185,7 +183,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.api.ClientProto.getDescriptor();
     com.google.api.FieldBehaviorProto.getDescriptor();
     com.google.api.HttpBodyProto.getDescriptor();
-    com.google.api.ResourceProto.getDescriptor();
     com.google.cloud.retail.v2alpha.ImportConfigProto.getDescriptor();
     com.google.cloud.retail.v2alpha.PurgeConfigProto.getDescriptor();
     com.google.cloud.retail.v2alpha.UserEventProto.getDescriptor();
diff --git a/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/export_config.proto b/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/export_config.proto
index 7260a1393d6..dd907d1ea91 100644
--- a/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/export_config.proto
+++ b/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/export_config.proto
@@ -16,8 +16,6 @@ syntax = "proto3";
 
 package google.cloud.retail.v2alpha;
 
-import "google/api/field_behavior.proto";
-import "google/api/resource.proto";
 import "google/protobuf/timestamp.proto";
 import "google/rpc/status.proto";
 
diff --git a/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/prediction_service.proto b/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/prediction_service.proto
index fbb3d1abc98..b76aed50b11 100644
--- a/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/prediction_service.proto
+++ b/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/prediction_service.proto
@@ -19,7 +19,6 @@ package google.cloud.retail.v2alpha;
 import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
-import "google/api/resource.proto";
 import "google/cloud/retail/v2alpha/user_event.proto";
 import "google/protobuf/struct.proto";
 
diff --git a/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/user_event_service.proto b/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/user_event_service.proto
index af97dad9dbc..35fe33f4bae 100644
--- a/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/user_event_service.proto
+++ b/java-retail/proto-google-cloud-retail-v2alpha/src/main/proto/google/cloud/retail/v2alpha/user_event_service.proto
@@ -20,7 +20,6 @@ import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
 import "google/api/httpbody.proto";
-import "google/api/resource.proto";
 import "google/cloud/retail/v2alpha/import_config.proto";
 import "google/cloud/retail/v2alpha/purge_config.proto";
 import "google/cloud/retail/v2alpha/user_event.proto";
diff --git a/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/ExportConfigProto.java b/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/ExportConfigProto.java
index e83032696c1..1e8def07b74 100644
--- a/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/ExportConfigProto.java
+++ b/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/ExportConfigProto.java
@@ -62,41 +62,37 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     java.lang.String[] descriptorData = {
       "\n.google/cloud/retail/v2beta/export_conf"
           + "ig.proto\022\032google.cloud.retail.v2beta\032\037go"
-          + "ogle/api/field_behavior.proto\032\031google/ap"
-          + "i/resource.proto\032\037google/protobuf/timest"
-          + "amp.proto\032\027google/rpc/status.proto\"9\n\022Ex"
-          + "portErrorsConfig\022\024\n\ngcs_prefix\030\001 \001(\tH\000B\r"
-          + "\n\013destination\"r\n\016ExportMetadata\022/\n\013creat"
-          + "e_time\030\001 \001(\0132\032.google.protobuf.Timestamp"
-          + "\022/\n\013update_time\030\002 \001(\0132\032.google.protobuf."
-          + "Timestamp\"\313\001\n\026ExportProductsResponse\022)\n\r"
-          + "error_samples\030\001 \003(\0132\022.google.rpc.Status\022"
-          + "E\n\rerrors_config\030\002 \001(\0132..google.cloud.re"
-          + "tail.v2beta.ExportErrorsConfig\022?\n\routput"
-          + "_result\030\003 \001(\0132(.google.cloud.retail.v2be"
-          + "ta.OutputResult\"\315\001\n\030ExportUserEventsResp"
-          + "onse\022)\n\rerror_samples\030\001 \003(\0132\022.google.rpc"
-          + ".Status\022E\n\rerrors_config\030\002 \001(\0132..google."
-          + "cloud.retail.v2beta.ExportErrorsConfig\022?"
-          + "\n\routput_result\030\003 \001(\0132(.google.cloud.ret"
-          + "ail.v2beta.OutputResult\"Y\n\014OutputResult\022"
-          + "I\n\017bigquery_result\030\001 \003(\01320.google.cloud."
-          + "retail.v2beta.BigQueryOutputResult\"<\n\024Bi"
-          + "gQueryOutputResult\022\022\n\ndataset_id\030\001 \001(\t\022\020"
-          + "\n\010table_id\030\002 \001(\tB\332\001\n\036com.google.cloud.re"
-          + "tail.v2betaB\021ExportConfigProtoP\001Z@google"
-          + ".golang.org/genproto/googleapis/cloud/re"
-          + "tail/v2beta;retail\242\002\006RETAIL\252\002\032Google.Clo"
-          + "ud.Retail.V2Beta\312\002\032Google\\Cloud\\Retail\\V"
-          + "2beta\352\002\035Google::Cloud::Retail::V2betab\006p"
-          + "roto3"
+          + "ogle/protobuf/timestamp.proto\032\027google/rp"
+          + "c/status.proto\"9\n\022ExportErrorsConfig\022\024\n\n"
+          + "gcs_prefix\030\001 \001(\tH\000B\r\n\013destination\"r\n\016Exp"
+          + "ortMetadata\022/\n\013create_time\030\001 \001(\0132\032.googl"
+          + "e.protobuf.Timestamp\022/\n\013update_time\030\002 \001("
+          + "\0132\032.google.protobuf.Timestamp\"\313\001\n\026Export"
+          + "ProductsResponse\022)\n\rerror_samples\030\001 \003(\0132"
+          + "\022.google.rpc.Status\022E\n\rerrors_config\030\002 \001"
+          + "(\0132..google.cloud.retail.v2beta.ExportEr"
+          + "rorsConfig\022?\n\routput_result\030\003 \001(\0132(.goog"
+          + "le.cloud.retail.v2beta.OutputResult\"\315\001\n\030"
+          + "ExportUserEventsResponse\022)\n\rerror_sample"
+          + "s\030\001 \003(\0132\022.google.rpc.Status\022E\n\rerrors_co"
+          + "nfig\030\002 \001(\0132..google.cloud.retail.v2beta."
+          + "ExportErrorsConfig\022?\n\routput_result\030\003 \001("
+          + "\0132(.google.cloud.retail.v2beta.OutputRes"
+          + "ult\"Y\n\014OutputResult\022I\n\017bigquery_result\030\001"
+          + " \003(\01320.google.cloud.retail.v2beta.BigQue"
+          + "ryOutputResult\"<\n\024BigQueryOutputResult\022\022"
+          + "\n\ndataset_id\030\001 \001(\t\022\020\n\010table_id\030\002 \001(\tB\332\001\n"
+          + "\036com.google.cloud.retail.v2betaB\021ExportC"
+          + "onfigProtoP\001Z@google.golang.org/genproto"
+          + "/googleapis/cloud/retail/v2beta;retail\242\002"
+          + "\006RETAIL\252\002\032Google.Cloud.Retail.V2Beta\312\002\032G"
+          + "oogle\\Cloud\\Retail\\V2beta\352\002\035Google::Clou"
+          + "d::Retail::V2betab\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
             descriptorData,
             new com.google.protobuf.Descriptors.FileDescriptor[] {
-              com.google.api.FieldBehaviorProto.getDescriptor(),
-              com.google.api.ResourceProto.getDescriptor(),
               com.google.protobuf.TimestampProto.getDescriptor(),
               com.google.rpc.StatusProto.getDescriptor(),
             });
@@ -148,8 +144,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
             new java.lang.String[] {
               "DatasetId", "TableId",
             });
-    com.google.api.FieldBehaviorProto.getDescriptor();
-    com.google.api.ResourceProto.getDescriptor();
     com.google.protobuf.TimestampProto.getDescriptor();
     com.google.rpc.StatusProto.getDescriptor();
   }
diff --git a/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/PredictionServiceProto.java b/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/PredictionServiceProto.java
index a4466626208..a4c570778fa 100644
--- a/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/PredictionServiceProto.java
+++ b/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/PredictionServiceProto.java
@@ -64,45 +64,44 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "service.proto\022\032google.cloud.retail.v2bet"
           + "a\032\034google/api/annotations.proto\032\027google/"
           + "api/client.proto\032\037google/api/field_behav"
-          + "ior.proto\032\031google/api/resource.proto\032+go"
-          + "ogle/cloud/retail/v2beta/user_event.prot"
-          + "o\032\034google/protobuf/struct.proto\"\274\003\n\016Pred"
-          + "ictRequest\022\026\n\tplacement\030\001 \001(\tB\003\340A\002\022>\n\nus"
-          + "er_event\030\002 \001(\0132%.google.cloud.retail.v2b"
-          + "eta.UserEventB\003\340A\002\022\021\n\tpage_size\030\003 \001(\005\022\022\n"
-          + "\npage_token\030\004 \001(\t\022\016\n\006filter\030\005 \001(\t\022\025\n\rval"
-          + "idate_only\030\006 \001(\010\022F\n\006params\030\007 \003(\01326.googl"
-          + "e.cloud.retail.v2beta.PredictRequest.Par"
-          + "amsEntry\022F\n\006labels\030\010 \003(\01326.google.cloud."
-          + "retail.v2beta.PredictRequest.LabelsEntry"
-          + "\032E\n\013ParamsEntry\022\013\n\003key\030\001 \001(\t\022%\n\005value\030\002 "
-          + "\001(\0132\026.google.protobuf.Value:\0028\001\032-\n\013Label"
-          + "sEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"\357"
-          + "\002\n\017PredictResponse\022M\n\007results\030\001 \003(\0132<.go"
-          + "ogle.cloud.retail.v2beta.PredictResponse"
-          + ".PredictionResult\022\031\n\021attribution_token\030\002"
-          + " \001(\t\022\023\n\013missing_ids\030\003 \003(\t\022\025\n\rvalidate_on"
-          + "ly\030\004 \001(\010\032\305\001\n\020PredictionResult\022\n\n\002id\030\001 \001("
-          + "\t\022\\\n\010metadata\030\002 \003(\0132J.google.cloud.retai"
-          + "l.v2beta.PredictResponse.PredictionResul"
-          + "t.MetadataEntry\032G\n\rMetadataEntry\022\013\n\003key\030"
-          + "\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.google.protobuf.V"
-          + "alue:\0028\0012\361\002\n\021PredictionService\022\220\002\n\007Predi"
-          + "ct\022*.google.cloud.retail.v2beta.PredictR"
-          + "equest\032+.google.cloud.retail.v2beta.Pred"
-          + "ictResponse\"\253\001\202\323\344\223\002\244\001\"J/v2beta/{placemen"
-          + "t=projects/*/locations/*/catalogs/*/plac"
-          + "ements/*}:predict:\001*ZS\"N/v2beta/{placeme"
-          + "nt=projects/*/locations/*/catalogs/*/ser"
-          + "vingConfigs/*}:predict:\001*\032I\312A\025retail.goo"
-          + "gleapis.com\322A.https://www.googleapis.com"
-          + "/auth/cloud-platformB\337\001\n\036com.google.clou"
-          + "d.retail.v2betaB\026PredictionServiceProtoP"
-          + "\001Z@google.golang.org/genproto/googleapis"
-          + "/cloud/retail/v2beta;retail\242\002\006RETAIL\252\002\032G"
-          + "oogle.Cloud.Retail.V2Beta\312\002\032Google\\Cloud"
-          + "\\Retail\\V2beta\352\002\035Google::Cloud::Retail::"
-          + "V2betab\006proto3"
+          + "ior.proto\032+google/cloud/retail/v2beta/us"
+          + "er_event.proto\032\034google/protobuf/struct.p"
+          + "roto\"\274\003\n\016PredictRequest\022\026\n\tplacement\030\001 \001"
+          + "(\tB\003\340A\002\022>\n\nuser_event\030\002 \001(\0132%.google.clo"
+          + "ud.retail.v2beta.UserEventB\003\340A\002\022\021\n\tpage_"
+          + "size\030\003 \001(\005\022\022\n\npage_token\030\004 \001(\t\022\016\n\006filter"
+          + "\030\005 \001(\t\022\025\n\rvalidate_only\030\006 \001(\010\022F\n\006params\030"
+          + "\007 \003(\01326.google.cloud.retail.v2beta.Predi"
+          + "ctRequest.ParamsEntry\022F\n\006labels\030\010 \003(\01326."
+          + "google.cloud.retail.v2beta.PredictReques"
+          + "t.LabelsEntry\032E\n\013ParamsEntry\022\013\n\003key\030\001 \001("
+          + "\t\022%\n\005value\030\002 \001(\0132\026.google.protobuf.Value"
+          + ":\0028\001\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005valu"
+          + "e\030\002 \001(\t:\0028\001\"\357\002\n\017PredictResponse\022M\n\007resul"
+          + "ts\030\001 \003(\0132<.google.cloud.retail.v2beta.Pr"
+          + "edictResponse.PredictionResult\022\031\n\021attrib"
+          + "ution_token\030\002 \001(\t\022\023\n\013missing_ids\030\003 \003(\t\022\025"
+          + "\n\rvalidate_only\030\004 \001(\010\032\305\001\n\020PredictionResu"
+          + "lt\022\n\n\002id\030\001 \001(\t\022\\\n\010metadata\030\002 \003(\0132J.googl"
+          + "e.cloud.retail.v2beta.PredictResponse.Pr"
+          + "edictionResult.MetadataEntry\032G\n\rMetadata"
+          + "Entry\022\013\n\003key\030\001 \001(\t\022%\n\005value\030\002 \001(\0132\026.goog"
+          + "le.protobuf.Value:\0028\0012\361\002\n\021PredictionServ"
+          + "ice\022\220\002\n\007Predict\022*.google.cloud.retail.v2"
+          + "beta.PredictRequest\032+.google.cloud.retai"
+          + "l.v2beta.PredictResponse\"\253\001\202\323\344\223\002\244\001\"J/v2b"
+          + "eta/{placement=projects/*/locations/*/ca"
+          + "talogs/*/placements/*}:predict:\001*ZS\"N/v2"
+          + "beta/{placement=projects/*/locations/*/c"
+          + "atalogs/*/servingConfigs/*}:predict:\001*\032I"
+          + "\312A\025retail.googleapis.com\322A.https://www.g"
+          + "oogleapis.com/auth/cloud-platformB\337\001\n\036co"
+          + "m.google.cloud.retail.v2betaB\026Prediction"
+          + "ServiceProtoP\001Z@google.golang.org/genpro"
+          + "to/googleapis/cloud/retail/v2beta;retail"
+          + "\242\002\006RETAIL\252\002\032Google.Cloud.Retail.V2Beta\312\002"
+          + "\032Google\\Cloud\\Retail\\V2beta\352\002\035Google::Cl"
+          + "oud::Retail::V2betab\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -111,7 +110,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               com.google.api.AnnotationsProto.getDescriptor(),
               com.google.api.ClientProto.getDescriptor(),
               com.google.api.FieldBehaviorProto.getDescriptor(),
-              com.google.api.ResourceProto.getDescriptor(),
               com.google.cloud.retail.v2beta.UserEventProto.getDescriptor(),
               com.google.protobuf.StructProto.getDescriptor(),
             });
@@ -189,7 +187,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.api.AnnotationsProto.getDescriptor();
     com.google.api.ClientProto.getDescriptor();
     com.google.api.FieldBehaviorProto.getDescriptor();
-    com.google.api.ResourceProto.getDescriptor();
     com.google.cloud.retail.v2beta.UserEventProto.getDescriptor();
     com.google.protobuf.StructProto.getDescriptor();
   }
diff --git a/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/UserEventServiceProto.java b/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/UserEventServiceProto.java
index b8802e9ae80..0c9207db606 100644
--- a/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/UserEventServiceProto.java
+++ b/java-retail/proto-google-cloud-retail-v2beta/src/main/java/com/google/cloud/retail/v2beta/UserEventServiceProto.java
@@ -60,64 +60,64 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "service.proto\022\032google.cloud.retail.v2bet"
           + "a\032\034google/api/annotations.proto\032\027google/"
           + "api/client.proto\032\037google/api/field_behav"
-          + "ior.proto\032\031google/api/httpbody.proto\032\031go"
-          + "ogle/api/resource.proto\032.google/cloud/re"
-          + "tail/v2beta/import_config.proto\032-google/"
-          + "cloud/retail/v2beta/purge_config.proto\032+"
-          + "google/cloud/retail/v2beta/user_event.pr"
-          + "oto\032#google/longrunning/operations.proto"
-          + "\"l\n\025WriteUserEventRequest\022\023\n\006parent\030\001 \001("
-          + "\tB\003\340A\002\022>\n\nuser_event\030\002 \001(\0132%.google.clou"
-          + "d.retail.v2beta.UserEventB\003\340A\002\"a\n\027Collec"
-          + "tUserEventRequest\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022\027"
-          + "\n\nuser_event\030\002 \001(\tB\003\340A\002\022\013\n\003uri\030\003 \001(\t\022\013\n\003"
-          + "ets\030\004 \001(\003\"\202\002\n\027RejoinUserEventsRequest\022\023\n"
-          + "\006parent\030\001 \001(\tB\003\340A\002\022i\n\027user_event_rejoin_"
-          + "scope\030\002 \001(\0162H.google.cloud.retail.v2beta"
-          + ".RejoinUserEventsRequest.UserEventRejoin"
-          + "Scope\"g\n\024UserEventRejoinScope\022\'\n#USER_EV"
-          + "ENT_REJOIN_SCOPE_UNSPECIFIED\020\000\022\021\n\rJOINED"
-          + "_EVENTS\020\001\022\023\n\017UNJOINED_EVENTS\020\002\">\n\030Rejoin"
-          + "UserEventsResponse\022\"\n\032rejoined_user_even"
-          + "ts_count\030\001 \001(\003\"\032\n\030RejoinUserEventsMetada"
-          + "ta2\373\t\n\020UserEventService\022\303\001\n\016WriteUserEve"
-          + "nt\0221.google.cloud.retail.v2beta.WriteUse"
-          + "rEventRequest\032%.google.cloud.retail.v2be"
-          + "ta.UserEvent\"W\202\323\344\223\002Q\"C/v2beta/{parent=pr"
-          + "ojects/*/locations/*/catalogs/*}/userEve"
-          + "nts:write:\nuser_event\022\254\001\n\020CollectUserEve"
-          + "nt\0223.google.cloud.retail.v2beta.CollectU"
-          + "serEventRequest\032\024.google.api.HttpBody\"M\202"
-          + "\323\344\223\002G\022E/v2beta/{parent=projects/*/locati"
-          + "ons/*/catalogs/*}/userEvents:collect\022\226\002\n"
-          + "\017PurgeUserEvents\0222.google.cloud.retail.v"
-          + "2beta.PurgeUserEventsRequest\032\035.google.lo"
-          + "ngrunning.Operation\"\257\001\202\323\344\223\002H\"C/v2beta/{p"
-          + "arent=projects/*/locations/*/catalogs/*}"
-          + "/userEvents:purge:\001*\312A^\n2google.cloud.re"
-          + "tail.v2beta.PurgeUserEventsResponse\022(goo"
-          + "gle.cloud.retail.v2beta.PurgeMetadata\022\233\002"
-          + "\n\020ImportUserEvents\0223.google.cloud.retail"
-          + ".v2beta.ImportUserEventsRequest\032\035.google"
-          + ".longrunning.Operation\"\262\001\202\323\344\223\002I\"D/v2beta"
-          + "/{parent=projects/*/locations/*/catalogs"
-          + "/*}/userEvents:import:\001*\312A`\n3google.clou"
-          + "d.retail.v2beta.ImportUserEventsResponse"
-          + "\022)google.cloud.retail.v2beta.ImportMetad"
-          + "ata\022\357\001\n\020RejoinUserEvents\0223.google.cloud."
-          + "retail.v2beta.RejoinUserEventsRequest\032\035."
-          + "google.longrunning.Operation\"\206\001\202\323\344\223\002I\"D/"
-          + "v2beta/{parent=projects/*/locations/*/ca"
-          + "talogs/*}/userEvents:rejoin:\001*\312A4\n\030Rejoi"
-          + "nUserEventsResponse\022\030RejoinUserEventsMet"
-          + "adata\032I\312A\025retail.googleapis.com\322A.https:"
-          + "//www.googleapis.com/auth/cloud-platform"
-          + "B\336\001\n\036com.google.cloud.retail.v2betaB\025Use"
-          + "rEventServiceProtoP\001Z@google.golang.org/"
-          + "genproto/googleapis/cloud/retail/v2beta;"
-          + "retail\242\002\006RETAIL\252\002\032Google.Cloud.Retail.V2"
-          + "Beta\312\002\032Google\\Cloud\\Retail\\V2beta\352\002\035Goog"
-          + "le::Cloud::Retail::V2betab\006proto3"
+          + "ior.proto\032\031google/api/httpbody.proto\032.go"
+          + "ogle/cloud/retail/v2beta/import_config.p"
+          + "roto\032-google/cloud/retail/v2beta/purge_c"
+          + "onfig.proto\032+google/cloud/retail/v2beta/"
+          + "user_event.proto\032#google/longrunning/ope"
+          + "rations.proto\"l\n\025WriteUserEventRequest\022\023"
+          + "\n\006parent\030\001 \001(\tB\003\340A\002\022>\n\nuser_event\030\002 \001(\0132"
+          + "%.google.cloud.retail.v2beta.UserEventB\003"
+          + "\340A\002\"a\n\027CollectUserEventRequest\022\023\n\006parent"
+          + "\030\001 \001(\tB\003\340A\002\022\027\n\nuser_event\030\002 \001(\tB\003\340A\002\022\013\n\003"
+          + "uri\030\003 \001(\t\022\013\n\003ets\030\004 \001(\003\"\202\002\n\027RejoinUserEve"
+          + "ntsRequest\022\023\n\006parent\030\001 \001(\tB\003\340A\002\022i\n\027user_"
+          + "event_rejoin_scope\030\002 \001(\0162H.google.cloud."
+          + "retail.v2beta.RejoinUserEventsRequest.Us"
+          + "erEventRejoinScope\"g\n\024UserEventRejoinSco"
+          + "pe\022\'\n#USER_EVENT_REJOIN_SCOPE_UNSPECIFIE"
+          + "D\020\000\022\021\n\rJOINED_EVENTS\020\001\022\023\n\017UNJOINED_EVENT"
+          + "S\020\002\">\n\030RejoinUserEventsResponse\022\"\n\032rejoi"
+          + "ned_user_events_count\030\001 \001(\003\"\032\n\030RejoinUse"
+          + "rEventsMetadata2\373\t\n\020UserEventService\022\303\001\n"
+          + "\016WriteUserEvent\0221.google.cloud.retail.v2"
+          + "beta.WriteUserEventRequest\032%.google.clou"
+          + "d.retail.v2beta.UserEvent\"W\202\323\344\223\002Q\"C/v2be"
+          + "ta/{parent=projects/*/locations/*/catalo"
+          + "gs/*}/userEvents:write:\nuser_event\022\254\001\n\020C"
+          + "ollectUserEvent\0223.google.cloud.retail.v2"
+          + "beta.CollectUserEventRequest\032\024.google.ap"
+          + "i.HttpBody\"M\202\323\344\223\002G\022E/v2beta/{parent=proj"
+          + "ects/*/locations/*/catalogs/*}/userEvent"
+          + "s:collect\022\226\002\n\017PurgeUserEvents\0222.google.c"
+          + "loud.retail.v2beta.PurgeUserEventsReques"
+          + "t\032\035.google.longrunning.Operation\"\257\001\202\323\344\223\002"
+          + "H\"C/v2beta/{parent=projects/*/locations/"
+          + "*/catalogs/*}/userEvents:purge:\001*\312A^\n2go"
+          + "ogle.cloud.retail.v2beta.PurgeUserEvents"
+          + "Response\022(google.cloud.retail.v2beta.Pur"
+          + "geMetadata\022\233\002\n\020ImportUserEvents\0223.google"
+          + ".cloud.retail.v2beta.ImportUserEventsReq"
+          + "uest\032\035.google.longrunning.Operation\"\262\001\202\323"
+          + "\344\223\002I\"D/v2beta/{parent=projects/*/locatio"
+          + "ns/*/catalogs/*}/userEvents:import:\001*\312A`"
+          + "\n3google.cloud.retail.v2beta.ImportUserE"
+          + "ventsResponse\022)google.cloud.retail.v2bet"
+          + "a.ImportMetadata\022\357\001\n\020RejoinUserEvents\0223."
+          + "google.cloud.retail.v2beta.RejoinUserEve"
+          + "ntsRequest\032\035.google.longrunning.Operatio"
+          + "n\"\206\001\202\323\344\223\002I\"D/v2beta/{parent=projects/*/l"
+          + "ocations/*/catalogs/*}/userEvents:rejoin"
+          + ":\001*\312A4\n\030RejoinUserEventsResponse\022\030Rejoin"
+          + "UserEventsMetadata\032I\312A\025retail.googleapis"
+          + ".com\322A.https://www.googleapis.com/auth/c"
+          + "loud-platformB\336\001\n\036com.google.cloud.retai"
+          + "l.v2betaB\025UserEventServiceProtoP\001Z@googl"
+          + "e.golang.org/genproto/googleapis/cloud/r"
+          + "etail/v2beta;retail\242\002\006RETAIL\252\002\032Google.Cl"
+          + "oud.Retail.V2Beta\312\002\032Google\\Cloud\\Retail\\"
+          + "V2beta\352\002\035Google::Cloud::Retail::V2betab\006"
+          + "proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -127,7 +127,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               com.google.api.ClientProto.getDescriptor(),
               com.google.api.FieldBehaviorProto.getDescriptor(),
               com.google.api.HttpBodyProto.getDescriptor(),
-              com.google.api.ResourceProto.getDescriptor(),
               com.google.cloud.retail.v2beta.ImportConfigProto.getDescriptor(),
               com.google.cloud.retail.v2beta.PurgeConfigProto.getDescriptor(),
               com.google.cloud.retail.v2beta.UserEventProto.getDescriptor(),
@@ -184,7 +183,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     com.google.api.ClientProto.getDescriptor();
     com.google.api.FieldBehaviorProto.getDescriptor();
     com.google.api.HttpBodyProto.getDescriptor();
-    com.google.api.ResourceProto.getDescriptor();
     com.google.cloud.retail.v2beta.ImportConfigProto.getDescriptor();
     com.google.cloud.retail.v2beta.PurgeConfigProto.getDescriptor();
     com.google.cloud.retail.v2beta.UserEventProto.getDescriptor();
diff --git a/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/export_config.proto b/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/export_config.proto
index 77d921f4bec..52ef46a42e7 100644
--- a/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/export_config.proto
+++ b/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/export_config.proto
@@ -16,8 +16,6 @@ syntax = "proto3";
 
 package google.cloud.retail.v2beta;
 
-import "google/api/field_behavior.proto";
-import "google/api/resource.proto";
 import "google/protobuf/timestamp.proto";
 import "google/rpc/status.proto";
 
diff --git a/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/prediction_service.proto b/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/prediction_service.proto
index e9128c148bf..d4d18ee1020 100644
--- a/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/prediction_service.proto
+++ b/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/prediction_service.proto
@@ -19,7 +19,6 @@ package google.cloud.retail.v2beta;
 import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
-import "google/api/resource.proto";
 import "google/cloud/retail/v2beta/user_event.proto";
 import "google/protobuf/struct.proto";
 
diff --git a/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/user_event_service.proto b/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/user_event_service.proto
index ab7a0b3514a..c647a45bb24 100644
--- a/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/user_event_service.proto
+++ b/java-retail/proto-google-cloud-retail-v2beta/src/main/proto/google/cloud/retail/v2beta/user_event_service.proto
@@ -20,7 +20,6 @@ import "google/api/annotations.proto";
 import "google/api/client.proto";
 import "google/api/field_behavior.proto";
 import "google/api/httpbody.proto";
-import "google/api/resource.proto";
 import "google/cloud/retail/v2beta/import_config.proto";
 import "google/cloud/retail/v2beta/purge_config.proto";
 import "google/cloud/retail/v2beta/user_event.proto";