From 4d70afe1827a91c319a8e83c372873cd65fb9723 Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Thu, 11 Jun 2020 01:46:43 -0700
Subject: [PATCH 1/5] changes without context

        autosynth cannot find the source of changes triggered by earlier changes in this
        repository, or by version upgrades to tools such as linters.
---
 README.md      | 2 +-
 synth.metadata | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 98523408a..a86982343 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>5.5.0</version>
+      <version>5.7.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
diff --git a/synth.metadata b/synth.metadata
index a623977da..cf67bf0b8 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-asset.git",
-        "sha": "2836ac15ac4e2684b89fa6c70c1fc7c8e372f691"
+        "sha": "fac502878c3b34ca0e4204ebdfd8afaa3570b315"
       }
     },
     {

From c35b4580d818daa4c72dd26f1e1806517afc286d Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Thu, 11 Jun 2020 01:54:04 -0700
Subject: [PATCH 2/5] fix: migrate asset/v1p4beta1 to grpc_service_config

PiperOrigin-RevId: 315775276

Source-Author: Google APIs <noreply@google.com>
Source-Date: Wed Jun 10 14:57:50 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 8a81e7e3ea5bdf30e406cc06dc90948574ba1058
Source-Link: https://github.com/googleapis/googleapis/commit/8a81e7e3ea5bdf30e406cc06dc90948574ba1058
---
 .../stub/AssetServiceStubSettings.java        | 40 ++++++++++++-------
 synth.metadata                                | 20 +++++-----
 2 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/AssetServiceStubSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/AssetServiceStubSettings.java
index 115b3d806..35994ac81 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/AssetServiceStubSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p4beta1/stub/AssetServiceStubSettings.java
@@ -214,11 +214,11 @@ public static class Builder extends StubSettings.Builder<AssetServiceStubSetting
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList(StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -232,12 +232,22 @@ public static class Builder extends StubSettings.Builder<AssetServiceStubSetting
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(300000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(300000L))
+              .setTotalTimeout(Duration.ofMillis(300000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -274,20 +284,20 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .exportIamPolicyAnalysisSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .analyzeIamPolicySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
       builder
           .exportIamPolicyAnalysisOperationSettings()
           .setInitialCallSettings(
               UnaryCallSettings
                   .<ExportIamPolicyAnalysisRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(
diff --git a/synth.metadata b/synth.metadata
index cf67bf0b8..9ce9e0eb6 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,40 +11,40 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
-        "internalRef": "313460921"
+        "sha": "8a81e7e3ea5bdf30e406cc06dc90948574ba1058",
+        "internalRef": "315775276"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
-        "internalRef": "313460921"
+        "sha": "8a81e7e3ea5bdf30e406cc06dc90948574ba1058",
+        "internalRef": "315775276"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
-        "internalRef": "313460921"
+        "sha": "8a81e7e3ea5bdf30e406cc06dc90948574ba1058",
+        "internalRef": "315775276"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
-        "internalRef": "313460921"
+        "sha": "8a81e7e3ea5bdf30e406cc06dc90948574ba1058",
+        "internalRef": "315775276"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "c4e37010d74071851ff24121f522e802231ac86e",
-        "internalRef": "313460921"
+        "sha": "8a81e7e3ea5bdf30e406cc06dc90948574ba1058",
+        "internalRef": "315775276"
       }
     },
     {

From 1c13adc4d246055dfcf328919f4370a65bbc1b59 Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Thu, 11 Jun 2020 01:55:16 -0700
Subject: [PATCH 3/5] fix: migrate asset/v1p1beta1 to grpc_service_config

PiperOrigin-RevId: 315777943

Source-Author: Google APIs <noreply@google.com>
Source-Date: Wed Jun 10 15:09:22 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 203ed2605b5806578e9aeb63388bc6aa9bbac659
Source-Link: https://github.com/googleapis/googleapis/commit/203ed2605b5806578e9aeb63388bc6aa9bbac659
---
 .../stub/AssetServiceStubSettings.java        | 22 ++++++++++---------
 synth.metadata                                | 20 ++++++++---------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/AssetServiceStubSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/AssetServiceStubSettings.java
index 69aac38be..2573fb95e 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/AssetServiceStubSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p1beta1/stub/AssetServiceStubSettings.java
@@ -343,11 +343,11 @@ public static class Builder extends StubSettings.Builder<AssetServiceStubSetting
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_1_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -361,12 +361,14 @@ public static class Builder extends StubSettings.Builder<AssetServiceStubSetting
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(15000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(15000L))
+              .setTotalTimeout(Duration.ofMillis(15000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("retry_policy_1_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -402,13 +404,13 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .searchAllResourcesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .searchAllIamPoliciesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       return builder;
     }
diff --git a/synth.metadata b/synth.metadata
index 9ce9e0eb6..77a881637 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,40 +11,40 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "8a81e7e3ea5bdf30e406cc06dc90948574ba1058",
-        "internalRef": "315775276"
+        "sha": "203ed2605b5806578e9aeb63388bc6aa9bbac659",
+        "internalRef": "315777943"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "8a81e7e3ea5bdf30e406cc06dc90948574ba1058",
-        "internalRef": "315775276"
+        "sha": "203ed2605b5806578e9aeb63388bc6aa9bbac659",
+        "internalRef": "315777943"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "8a81e7e3ea5bdf30e406cc06dc90948574ba1058",
-        "internalRef": "315775276"
+        "sha": "203ed2605b5806578e9aeb63388bc6aa9bbac659",
+        "internalRef": "315777943"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "8a81e7e3ea5bdf30e406cc06dc90948574ba1058",
-        "internalRef": "315775276"
+        "sha": "203ed2605b5806578e9aeb63388bc6aa9bbac659",
+        "internalRef": "315777943"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "8a81e7e3ea5bdf30e406cc06dc90948574ba1058",
-        "internalRef": "315775276"
+        "sha": "203ed2605b5806578e9aeb63388bc6aa9bbac659",
+        "internalRef": "315777943"
       }
     },
     {

From d4c29795eef2c8ca790c2f861032c35aebd85345 Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Thu, 11 Jun 2020 01:57:44 -0700
Subject: [PATCH 4/5] fix: migrate asset/v1beta1 to grpc_service_config

PiperOrigin-RevId: 315789764

Source-Author: Google APIs <noreply@google.com>
Source-Date: Wed Jun 10 16:15:36 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: 00de455b588d7203012fec514d91b0eb63e41af3
Source-Link: https://github.com/googleapis/googleapis/commit/00de455b588d7203012fec514d91b0eb63e41af3
---
 .../stub/AssetServiceStubSettings.java        | 36 ++++++++++++-------
 synth.metadata                                | 20 +++++------
 2 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/stub/AssetServiceStubSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/stub/AssetServiceStubSettings.java
index dd04d34ef..e3ab77b21 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/stub/AssetServiceStubSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1beta1/stub/AssetServiceStubSettings.java
@@ -204,11 +204,13 @@ public static class Builder extends StubSettings.Builder<AssetServiceStubSetting
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_1_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -222,12 +224,22 @@ public static class Builder extends StubSettings.Builder<AssetServiceStubSetting
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -264,20 +276,20 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .exportAssetsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .batchGetAssetsHistorySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
       builder
           .exportAssetsOperationSettings()
           .setInitialCallSettings(
               UnaryCallSettings
                   .<ExportAssetsRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(ExportAssetsResponse.class))
diff --git a/synth.metadata b/synth.metadata
index 77a881637..9b9d8fe64 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,40 +11,40 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "203ed2605b5806578e9aeb63388bc6aa9bbac659",
-        "internalRef": "315777943"
+        "sha": "00de455b588d7203012fec514d91b0eb63e41af3",
+        "internalRef": "315789764"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "203ed2605b5806578e9aeb63388bc6aa9bbac659",
-        "internalRef": "315777943"
+        "sha": "00de455b588d7203012fec514d91b0eb63e41af3",
+        "internalRef": "315789764"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "203ed2605b5806578e9aeb63388bc6aa9bbac659",
-        "internalRef": "315777943"
+        "sha": "00de455b588d7203012fec514d91b0eb63e41af3",
+        "internalRef": "315789764"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "203ed2605b5806578e9aeb63388bc6aa9bbac659",
-        "internalRef": "315777943"
+        "sha": "00de455b588d7203012fec514d91b0eb63e41af3",
+        "internalRef": "315789764"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "203ed2605b5806578e9aeb63388bc6aa9bbac659",
-        "internalRef": "315777943"
+        "sha": "00de455b588d7203012fec514d91b0eb63e41af3",
+        "internalRef": "315789764"
       }
     },
     {

From 47674bbc108070ee0ae409e7852191fc398e2280 Mon Sep 17 00:00:00 2001
From: yoshi-automation <yoshi-automation@google.com>
Date: Thu, 11 Jun 2020 01:57:44 -0700
Subject: [PATCH 5/5] fix: migrate asset/v1p2beta1 to grpc_service_config

PiperOrigin-RevId: 315789780

Source-Author: Google APIs <noreply@google.com>
Source-Date: Wed Jun 10 16:15:40 2020 -0700
Source-Repo: googleapis/googleapis
Source-Sha: a8ebb52bc3b8ff0e41cb34b19c1c9a8af2a9c9eb
Source-Link: https://github.com/googleapis/googleapis/commit/a8ebb52bc3b8ff0e41cb34b19c1c9a8af2a9c9eb
---
 .../stub/AssetServiceStubSettings.java        | 44 ++++++++++++-------
 synth.metadata                                | 20 ++++-----
 2 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/AssetServiceStubSettings.java b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/AssetServiceStubSettings.java
index 0f73b6251..387920a6b 100644
--- a/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/AssetServiceStubSettings.java
+++ b/google-cloud-asset/src/main/java/com/google/cloud/asset/v1p2beta1/stub/AssetServiceStubSettings.java
@@ -209,11 +209,13 @@ public static class Builder extends StubSettings.Builder<AssetServiceStubSetting
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_1_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -227,12 +229,22 @@ public static class Builder extends StubSettings.Builder<AssetServiceStubSetting
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(60000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(60000L))
+              .setTotalTimeout(Duration.ofMillis(60000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -277,28 +289,28 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .deleteFeedSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .createFeedSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       builder
           .getFeedSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .listFeedsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .updateFeedSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       return builder;
     }
diff --git a/synth.metadata b/synth.metadata
index 9b9d8fe64..4cf4abd7e 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,40 +11,40 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "00de455b588d7203012fec514d91b0eb63e41af3",
-        "internalRef": "315789764"
+        "sha": "a8ebb52bc3b8ff0e41cb34b19c1c9a8af2a9c9eb",
+        "internalRef": "315789780"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "00de455b588d7203012fec514d91b0eb63e41af3",
-        "internalRef": "315789764"
+        "sha": "a8ebb52bc3b8ff0e41cb34b19c1c9a8af2a9c9eb",
+        "internalRef": "315789780"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "00de455b588d7203012fec514d91b0eb63e41af3",
-        "internalRef": "315789764"
+        "sha": "a8ebb52bc3b8ff0e41cb34b19c1c9a8af2a9c9eb",
+        "internalRef": "315789780"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "00de455b588d7203012fec514d91b0eb63e41af3",
-        "internalRef": "315789764"
+        "sha": "a8ebb52bc3b8ff0e41cb34b19c1c9a8af2a9c9eb",
+        "internalRef": "315789780"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "00de455b588d7203012fec514d91b0eb63e41af3",
-        "internalRef": "315789764"
+        "sha": "a8ebb52bc3b8ff0e41cb34b19c1c9a8af2a9c9eb",
+        "internalRef": "315789780"
       }
     },
     {