diff --git a/google/spanner/admin/database/v1/spanner_admin_database_grpc_service_config.json b/google/spanner/admin/database/v1/spanner_admin_database_grpc_service_config.json
index e19bb95b..4eb2525b 100755
--- a/google/spanner/admin/database/v1/spanner_admin_database_grpc_service_config.json
+++ b/google/spanner/admin/database/v1/spanner_admin_database_grpc_service_config.json
@@ -22,29 +22,17 @@
           "service": "google.spanner.admin.database.v1.DatabaseAdmin",
           "method": "GetDatabaseDdl"
         },
-        {
-          "service": "google.spanner.admin.database.v1.DatabaseAdmin",
-          "method": "GetIamPolicy"
-        },
         {
           "service": "google.spanner.admin.database.v1.DatabaseAdmin",
           "method": "GetBackup"
         },
-        {
-          "service": "google.spanner.admin.database.v1.DatabaseAdmin",
-          "method": "UpdateBackup"
-        },
-        {
-          "service": "google.spanner.admin.database.v1.DatabaseAdmin",
-          "method": "DeleteBackup"
-        },
         {
           "service": "google.spanner.admin.database.v1.DatabaseAdmin",
           "method": "ListBackups"
         },
         {
           "service": "google.spanner.admin.database.v1.DatabaseAdmin",
-          "method": "RestoreDatabase"
+          "method": "DeleteBackup"
         },
         {
           "service": "google.spanner.admin.database.v1.DatabaseAdmin",
@@ -66,12 +54,47 @@
         ]
       }
     },
+    {
+      "name": [
+        {
+          "service": "google.spanner.admin.database.v1.DatabaseAdmin",
+          "method": "GetIamPolicy"
+        }
+      ],
+      "timeout": "30s",
+      "retryPolicy": {
+        "initialBackoff": "1s",
+        "maxBackoff": "32s",
+        "backoffMultiplier": 1.3,
+        "retryableStatusCodes": [
+          "UNAVAILABLE",
+          "DEADLINE_EXCEEDED"
+        ]
+      }
+    },
     {
       "name": [
         {
           "service": "google.spanner.admin.database.v1.DatabaseAdmin",
           "method": "CreateDatabase"
         },
+        {
+          "service": "google.spanner.admin.database.v1.DatabaseAdmin",
+          "method": "CreateBackup"
+        },
+        {
+          "service": "google.spanner.admin.database.v1.DatabaseAdmin",
+          "method": "UpdateBackup"
+        },
+        {
+          "service": "google.spanner.admin.database.v1.DatabaseAdmin",
+          "method": "RestoreDatabase"
+        }
+      ],
+      "timeout": "3600s"
+    },
+    {
+      "name": [
         {
           "service": "google.spanner.admin.database.v1.DatabaseAdmin",
           "method": "SetIamPolicy"
@@ -79,13 +102,9 @@
         {
           "service": "google.spanner.admin.database.v1.DatabaseAdmin",
           "method": "TestIamPermissions"
-        },
-        {
-          "service": "google.spanner.admin.database.v1.DatabaseAdmin",
-          "method": "CreateBackup"
         }
       ],
-      "timeout": "3600s"
+      "timeout": "30s"
     }
   ]
 }
diff --git a/google/spanner/admin/instance/v1/spanner_admin_instance_grpc_service_config.json b/google/spanner/admin/instance/v1/spanner_admin_instance_grpc_service_config.json
index e4436744..f1241560 100755
--- a/google/spanner/admin/instance/v1/spanner_admin_instance_grpc_service_config.json
+++ b/google/spanner/admin/instance/v1/spanner_admin_instance_grpc_service_config.json
@@ -21,13 +21,27 @@
         {
           "service": "google.spanner.admin.instance.v1.InstanceAdmin",
           "method": "DeleteInstance"
-        },
+        }
+      ],
+      "timeout": "3600s",
+      "retryPolicy": {
+        "initialBackoff": "1s",
+        "maxBackoff": "32s",
+        "backoffMultiplier": 1.3,
+        "retryableStatusCodes": [
+          "UNAVAILABLE",
+          "DEADLINE_EXCEEDED"
+        ]
+      }
+    },
+    {
+      "name": [
         {
           "service": "google.spanner.admin.instance.v1.InstanceAdmin",
           "method": "GetIamPolicy"
         }
       ],
-      "timeout": "3600s",
+      "timeout": "30s",
       "retryPolicy": {
         "initialBackoff": "1s",
         "maxBackoff": "32s",
@@ -47,7 +61,12 @@
         {
           "service": "google.spanner.admin.instance.v1.InstanceAdmin",
           "method": "UpdateInstance"
-        },
+        }
+      ],
+      "timeout": "3600s"
+    },
+    {
+      "name": [
         {
           "service": "google.spanner.admin.instance.v1.InstanceAdmin",
           "method": "SetIamPolicy"
@@ -57,7 +76,7 @@
           "method": "TestIamPermissions"
         }
       ],
-      "timeout": "3600s"
+      "timeout": "30s"
     }
   ]
 }
diff --git a/google/spanner/v1/spanner_grpc_service_config.json b/google/spanner/v1/spanner_grpc_service_config.json
index 8602c942..49ea75f8 100755
--- a/google/spanner/v1/spanner_grpc_service_config.json
+++ b/google/spanner/v1/spanner_grpc_service_config.json
@@ -18,6 +18,10 @@
         {
           "service": "google.spanner.v1.Spanner",
           "method": "Commit"
+        },
+        {
+          "service": "google.spanner.v1.Spanner",
+          "method": "ListSessions"
         }
       ],
       "timeout": "3600s",
@@ -30,24 +34,33 @@
         ]
       }
     },
+    {
+      "name": [
+        {
+          "service": "google.spanner.v1.Spanner",
+          "method": "BatchCreateSessions"
+        }
+      ],
+      "timeout": "60s",
+      "retryPolicy": {
+        "initialBackoff": "0.250s",
+        "maxBackoff": "32s",
+        "backoffMultiplier": 1.3,
+        "retryableStatusCodes": [
+          "UNAVAILABLE"
+        ]
+      }
+    },
     {
       "name": [
         {
           "service": "google.spanner.v1.Spanner",
           "method": "CreateSession"
         },
-        {
-          "service": "google.spanner.v1.Spanner",
-          "method": "BatchCreateSessions"
-        },
         {
           "service": "google.spanner.v1.Spanner",
           "method": "GetSession"
         },
-        {
-          "service": "google.spanner.v1.Spanner",
-          "method": "ListSessions"
-        },
         {
           "service": "google.spanner.v1.Spanner",
           "method": "DeleteSession"