From 2b881f55092faef46cb63363566b6166f3a90535 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 11 Nov 2020 17:18:41 +0100 Subject: [PATCH 1/9] chore(deps): update dependency com.google.cloud:google-cloud-bigtable to v1.17.2 (#522) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 8a4d1fe74f..5b22a72043 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigtable - 1.17.1 + 1.17.2 From 0cf4b754b7a3dd87795d6e100c2d1f693a2eff0c Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 11 Nov 2020 16:28:13 +0000 Subject: [PATCH 2/9] chore: release 1.17.4-SNAPSHOT (#525) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). --- google-cloud-bigtable-bom/pom.xml | 14 +++++++------- google-cloud-bigtable-deps-bom/pom.xml | 2 +- google-cloud-bigtable-emulator/pom.xml | 8 ++++---- google-cloud-bigtable/pom.xml | 10 +++++----- grpc-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- grpc-google-cloud-bigtable-v2/pom.xml | 8 ++++---- pom.xml | 2 +- proto-google-cloud-bigtable-admin-v2/pom.xml | 8 ++++---- proto-google-cloud-bigtable-v2/pom.xml | 8 ++++---- samples/snapshot/pom.xml | 2 +- versions.txt | 12 ++++++------ 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml index 08cc5d5500..d792116407 100644 --- a/google-cloud-bigtable-bom/pom.xml +++ b/google-cloud-bigtable-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigtable-bom - 1.17.3 + 1.17.4-SNAPSHOT pom com.google.cloud @@ -72,32 +72,32 @@ com.google.cloud google-cloud-bigtable - 1.17.3 + 1.17.4-SNAPSHOT com.google.cloud google-cloud-bigtable-emulator - 0.126.3 + 0.126.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 1.17.3 + 1.17.4-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-v2 - 1.17.3 + 1.17.4-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 1.17.3 + 1.17.4-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-v2 - 1.17.3 + 1.17.4-SNAPSHOT diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml index 5a9b845eb5..87a505e4bc 100644 --- a/google-cloud-bigtable-deps-bom/pom.xml +++ b/google-cloud-bigtable-deps-bom/pom.xml @@ -12,7 +12,7 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.17.3 + 1.17.4-SNAPSHOT pom diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml index e9b203393e..5f6abf6f13 100644 --- a/google-cloud-bigtable-emulator/pom.xml +++ b/google-cloud-bigtable-emulator/pom.xml @@ -5,7 +5,7 @@ 4.0.0 google-cloud-bigtable-emulator - 0.126.3 + 0.126.4-SNAPSHOT Google Cloud Java - Bigtable Emulator https://github.com/googleapis/java-bigtable @@ -14,7 +14,7 @@ com.google.cloud google-cloud-bigtable-parent - 1.17.3 + 1.17.4-SNAPSHOT scm:git:git@github.com:googleapis/java-bigtable.git @@ -80,14 +80,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml index 3ce4381a13..1c4412d275 100644 --- a/google-cloud-bigtable/pom.xml +++ b/google-cloud-bigtable/pom.xml @@ -2,7 +2,7 @@ 4.0.0 google-cloud-bigtable - 1.17.3 + 1.17.4-SNAPSHOT jar Google Cloud Bigtable https://github.com/googleapis/java-bigtable @@ -12,11 +12,11 @@ com.google.cloud google-cloud-bigtable-parent - 1.17.3 + 1.17.4-SNAPSHOT - 1.17.3 + 1.17.4-SNAPSHOT google-cloud-bigtable @@ -39,14 +39,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml index feb8751657..acfe7eeaad 100644 --- a/grpc-google-cloud-bigtable-admin-v2/pom.xml +++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 1.17.3 + 1.17.4-SNAPSHOT grpc-google-cloud-bigtable-admin-v2 GRPC library for grpc-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.17.3 + 1.17.4-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml index 37d993c7e4..8785b8fb51 100644 --- a/grpc-google-cloud-bigtable-v2/pom.xml +++ b/grpc-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigtable-v2 - 1.17.3 + 1.17.4-SNAPSHOT grpc-google-cloud-bigtable-v2 GRPC library for grpc-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.17.3 + 1.17.4-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import diff --git a/pom.xml b/pom.xml index c673986900..8483b503b7 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ google-cloud-bigtable-parent pom - 1.17.3 + 1.17.4-SNAPSHOT Google Cloud Bigtable Parent https://github.com/googleapis/java-bigtable diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml index b883fc045b..7605ee37b9 100644 --- a/proto-google-cloud-bigtable-admin-v2/pom.xml +++ b/proto-google-cloud-bigtable-admin-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 1.17.3 + 1.17.4-SNAPSHOT proto-google-cloud-bigtable-admin-v2 PROTO library for proto-google-cloud-bigtable-admin-v2 com.google.cloud google-cloud-bigtable-parent - 1.17.3 + 1.17.4-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml index 4ca7a8df28..b37f19841a 100644 --- a/proto-google-cloud-bigtable-v2/pom.xml +++ b/proto-google-cloud-bigtable-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigtable-v2 - 1.17.3 + 1.17.4-SNAPSHOT proto-google-cloud-bigtable-v2 PROTO library for proto-google-cloud-bigtable-v2 com.google.cloud google-cloud-bigtable-parent - 1.17.3 + 1.17.4-SNAPSHOT @@ -18,14 +18,14 @@ com.google.cloud google-cloud-bigtable-deps-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import com.google.cloud google-cloud-bigtable-bom - 1.17.3 + 1.17.4-SNAPSHOT pom import diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e862adf4c5..744ce31eb0 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigtable - 1.17.3 + 1.17.4-SNAPSHOT diff --git a/versions.txt b/versions.txt index 66b51cdd55..9e74ec90e2 100644 --- a/versions.txt +++ b/versions.txt @@ -1,9 +1,9 @@ # Format: # module:released-version:current-version -google-cloud-bigtable:1.17.3:1.17.3 -grpc-google-cloud-bigtable-admin-v2:1.17.3:1.17.3 -grpc-google-cloud-bigtable-v2:1.17.3:1.17.3 -proto-google-cloud-bigtable-admin-v2:1.17.3:1.17.3 -proto-google-cloud-bigtable-v2:1.17.3:1.17.3 -google-cloud-bigtable-emulator:0.126.3:0.126.3 +google-cloud-bigtable:1.17.3:1.17.4-SNAPSHOT +grpc-google-cloud-bigtable-admin-v2:1.17.3:1.17.4-SNAPSHOT +grpc-google-cloud-bigtable-v2:1.17.3:1.17.4-SNAPSHOT +proto-google-cloud-bigtable-admin-v2:1.17.3:1.17.4-SNAPSHOT +proto-google-cloud-bigtable-v2:1.17.3:1.17.4-SNAPSHOT +google-cloud-bigtable-emulator:0.126.3:0.126.4-SNAPSHOT From 682d06e1e120ea31919116d8d5cc9be64bdeac39 Mon Sep 17 00:00:00 2001 From: kolea2 <45548808+kolea2@users.noreply.github.com> Date: Wed, 11 Nov 2020 17:59:53 +0000 Subject: [PATCH 3/9] test(fix): do not skip backup ITs (#498) * test(fix): do not skip backup ITs * formatting * create new cluster for test * formatting * skip for emulator profile * skip for emulator profile * use test env * instance name * lint --- .../admin/v2/it/BigtableBackupIT.java | 213 +++++++----------- 1 file changed, 81 insertions(+), 132 deletions(-) diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java index 10bd7da14d..10c4958b28 100644 --- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java +++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/it/BigtableBackupIT.java @@ -17,6 +17,7 @@ import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertWithMessage; +import static com.google.common.truth.TruthJUnit.assume; import static io.grpc.Status.Code.NOT_FOUND; import static org.junit.Assert.fail; @@ -24,20 +25,23 @@ import com.google.api.core.ApiFutures; import com.google.api.gax.rpc.ApiException; import com.google.cloud.Policy; +import com.google.cloud.bigtable.admin.v2.BigtableInstanceAdminClient; import com.google.cloud.bigtable.admin.v2.BigtableTableAdminClient; -import com.google.cloud.bigtable.admin.v2.BigtableTableAdminSettings; import com.google.cloud.bigtable.admin.v2.models.Backup; import com.google.cloud.bigtable.admin.v2.models.CreateBackupRequest; +import com.google.cloud.bigtable.admin.v2.models.CreateInstanceRequest; import com.google.cloud.bigtable.admin.v2.models.CreateTableRequest; +import com.google.cloud.bigtable.admin.v2.models.Instance.Type; import com.google.cloud.bigtable.admin.v2.models.RestoreTableRequest; import com.google.cloud.bigtable.admin.v2.models.RestoredTableResult; +import com.google.cloud.bigtable.admin.v2.models.StorageType; import com.google.cloud.bigtable.admin.v2.models.Table; import com.google.cloud.bigtable.admin.v2.models.UpdateBackupRequest; import com.google.cloud.bigtable.data.v2.BigtableDataClient; -import com.google.cloud.bigtable.data.v2.BigtableDataSettings; import com.google.cloud.bigtable.data.v2.models.RowMutation; -import com.google.common.base.Joiner; -import com.google.common.base.MoreObjects; +import com.google.cloud.bigtable.test_helpers.env.AbstractTestEnv; +import com.google.cloud.bigtable.test_helpers.env.EmulatorEnv; +import com.google.cloud.bigtable.test_helpers.env.TestEnvRule; import com.google.common.collect.Lists; import com.google.protobuf.Timestamp; import io.grpc.StatusRuntimeException; @@ -56,25 +60,19 @@ @RunWith(JUnit4.class) public class BigtableBackupIT { + @ClassRule public static TestEnvRule testEnvRule = new TestEnvRule(); + private static final Logger LOGGER = Logger.getLogger(BigtableBackupIT.class.getName()); - private static final String PROJECT_PROPERTY_NAME = "bigtable.project"; - private static final String INSTANCE_PROPERTY_NAME = "bigtable.instance"; - private static final String CLUSTER_PROPERTY_NAME = "bigtable.cluster"; - private static final String ADMIN_ENDPOINT_PROPERTY_NAME = "bigtable.adminendpoint"; - private static final String DATA_ENDPOINT_PROPERTY_NAME = "bigtable.dataendpoint"; - private static final String TABLE_SIZE_PROPERTY_NAME = "bigtable.tablesizekb"; private static final int[] BACKOFF_DURATION = {2, 4, 8, 16, 32, 64, 128, 256, 512, 1024}; private static final String TEST_TABLE_SUFFIX = "test-table-for-backup-it"; private static final String TEST_BACKUP_SUFFIX = "test-backup-for-backup-it"; - private static final int DAYS_IN_SECONDS = 24 * 60 * 60; - private static BigtableTableAdminClient tableAdmin; + private static BigtableInstanceAdminClient instanceAdmin; private static BigtableDataClient dataClient; - private static String targetProject; private static String targetInstance; private static String targetCluster; private static Table testTable; @@ -83,90 +81,48 @@ public class BigtableBackupIT { @BeforeClass public static void createClient() throws IOException, InterruptedException, ExecutionException, TimeoutException { - List missingProperties = Lists.newArrayList(); - - targetProject = System.getProperty(PROJECT_PROPERTY_NAME); - if (targetProject == null) { - missingProperties.add(PROJECT_PROPERTY_NAME); - } - - targetInstance = System.getProperty(INSTANCE_PROPERTY_NAME); - if (targetInstance == null) { - missingProperties.add(INSTANCE_PROPERTY_NAME); - } + assume() + .withMessage("BigtableInstanceAdminClient is not supported on Emulator") + .that(testEnvRule.env()) + .isNotInstanceOf(EmulatorEnv.class); - targetCluster = System.getProperty(CLUSTER_PROPERTY_NAME); - if (targetCluster == null) { - missingProperties.add(CLUSTER_PROPERTY_NAME); - } + instanceAdmin = testEnvRule.env().getInstanceAdminClient(); - String adminApiEndpoint = System.getProperty(ADMIN_ENDPOINT_PROPERTY_NAME); - if (adminApiEndpoint == null) { - adminApiEndpoint = "bigtableadmin.googleapis.com:443"; - } + targetCluster = AbstractTestEnv.TEST_CLUSTER_PREFIX + Instant.now().getEpochSecond(); + targetInstance = + AbstractTestEnv.TEST_INSTANCE_PREFIX + "backup-" + Instant.now().getEpochSecond(); - int tableSize = MoreObjects.firstNonNull(Integer.getInteger(TABLE_SIZE_PROPERTY_NAME), 1); - if (!missingProperties.isEmpty()) { - LOGGER.warning("Missing properties: " + Joiner.on(",").join(missingProperties)); - return; - } + instanceAdmin.createInstance( + CreateInstanceRequest.of(targetInstance) + .addCluster(targetCluster, testEnvRule.env().getPrimaryZone(), 3, StorageType.SSD) + .setDisplayName("backups-test-instance") + .addLabel("state", "readytodelete") + .setType(Type.PRODUCTION)); // Setup a prefix to avoid collisions between concurrent test runs prefix = String.format("020%d", System.currentTimeMillis()); - BigtableTableAdminSettings.Builder settings = - BigtableTableAdminSettings.newBuilder() - .setInstanceId(targetInstance) - .setProjectId(targetProject); - settings.stubSettings().setEndpoint(adminApiEndpoint); - tableAdmin = BigtableTableAdminClient.create(settings.build()); + tableAdmin = BigtableTableAdminClient.create(testEnvRule.env().getProjectId(), targetInstance); testTable = tableAdmin.createTable( CreateTableRequest.of(generateId(TEST_TABLE_SUFFIX)).addFamily("cf1")); // Populate test data. - if (tableSize > 0) { - String dataApiEndpoint = System.getProperty(DATA_ENDPOINT_PROPERTY_NAME); - if (dataApiEndpoint == null) { - dataApiEndpoint = "bigtable.googleapis.com:443"; - } - BigtableDataSettings.Builder dataSettings = - BigtableDataSettings.newBuilder() - .setInstanceId(targetInstance) - .setProjectId(targetProject); - dataSettings.stubSettings().setEndpoint(dataApiEndpoint); - dataClient = BigtableDataClient.create(dataSettings.build()); - byte[] rowBytes = new byte[1024]; - Random random = new Random(); - random.nextBytes(rowBytes); - - List> futures = Lists.newArrayList(); - for (int i = 0; i < tableSize; i++) { - ApiFuture future = - dataClient.mutateRowAsync( - RowMutation.create(testTable.getId(), "test-row-" + i) - .setCell("cf1", "", rowBytes.toString())); - futures.add(future); - } - ApiFutures.allAsList(futures).get(3, TimeUnit.MINUTES); - } - - // Cleanup old backups and tables, under normal circumstances this will do nothing - String stalePrefix = - String.format("020%d", System.currentTimeMillis() - TimeUnit.HOURS.toMillis(2)); - for (String backupId : tableAdmin.listBackups(targetCluster)) { - if (backupId.endsWith(TEST_BACKUP_SUFFIX) && stalePrefix.compareTo(backupId) > 0) { - LOGGER.info("Deleting stale backup: " + backupId); - tableAdmin.deleteBackup(targetCluster, backupId); - } - } - for (String tableId : tableAdmin.listTables()) { - if (tableId.endsWith("TEST_TABLE_SUFFIX") && stalePrefix.compareTo(tableId) > 0) { - LOGGER.info("Deleting stale backup: " + tableId); - tableAdmin.deleteTable(tableId); - } + dataClient = BigtableDataClient.create(testEnvRule.env().getProjectId(), targetInstance); + byte[] rowBytes = new byte[1024]; + Random random = new Random(); + random.nextBytes(rowBytes); + + List> futures = Lists.newArrayList(); + for (int i = 0; i < 10; i++) { + ApiFuture future = + dataClient.mutateRowAsync( + RowMutation.create(testTable.getId(), "test-row-" + i) + .setCell("cf1", "", rowBytes.toString())); + futures.add(future); } + ApiFutures.allAsList(futures).get(3, TimeUnit.MINUTES); } @AfterClass @@ -179,6 +135,10 @@ public static void closeClient() { } } + if (targetInstance != null) { + instanceAdmin.deleteInstance(targetInstance); + } + if (tableAdmin != null) { tableAdmin.close(); } @@ -247,8 +207,8 @@ public void listBackupTest() throws InterruptedException { String backupId2 = generateId("list-2-" + TEST_BACKUP_SUFFIX); try { - createBackupAndWait(backupId1); - createBackupAndWait(backupId2); + tableAdmin.createBackup(createBackupRequest(backupId1)); + tableAdmin.createBackup(createBackupRequest(backupId2)); List response = tableAdmin.listBackups(targetCluster); // Concurrent tests running may cause flakiness. Use containsAtLeast instead of @@ -265,7 +225,7 @@ public void listBackupTest() throws InterruptedException { @Test public void updateBackupTest() throws InterruptedException { String backupId = generateId("update-" + TEST_BACKUP_SUFFIX); - createBackupAndWait(backupId); + tableAdmin.createBackup(createBackupRequest(backupId)); Instant expireTime = Instant.now().plus(Duration.ofDays(20)); UpdateBackupRequest req = @@ -282,7 +242,7 @@ public void updateBackupTest() throws InterruptedException { public void deleteBackupTest() throws InterruptedException { String backupId = generateId("delete-" + TEST_BACKUP_SUFFIX); - createBackupAndWait(backupId); + tableAdmin.createBackup(createBackupRequest(backupId)); tableAdmin.deleteBackup(targetCluster, backupId); try { @@ -307,7 +267,7 @@ public void deleteBackupTest() throws InterruptedException { public void restoreTableTest() throws InterruptedException, ExecutionException { String backupId = generateId("restore-" + TEST_BACKUP_SUFFIX); String tableId = generateId("restored-table"); - createBackupAndWait(backupId); + tableAdmin.createBackup(createBackupRequest(backupId)); // Wait 2 minutes so that the RestoreTable API will trigger an optimize restored // table operation. @@ -320,13 +280,15 @@ public void restoreTableTest() throws InterruptedException, ExecutionException { .that(result.getTable().getId()) .isEqualTo(tableId); - // The assertion might be missing if the test is running against a HDD cluster or an - // optimization is not necessary. - assertWithMessage("Empty OptimizeRestoredTable token") - .that(result.getOptimizeRestoredTableOperationToken()) - .isNotNull(); - tableAdmin.awaitOptimizeRestoredTable(result.getOptimizeRestoredTableOperationToken()); - tableAdmin.getTable(tableId); + if (result.getOptimizeRestoredTableOperationToken() != null) { + // The assertion might be missing if the test is running against a HDD cluster or an + // optimization is not necessary. + tableAdmin.awaitOptimizeRestoredTable(result.getOptimizeRestoredTableOperationToken()); + Table restoredTable = tableAdmin.getTable(tableId); + assertWithMessage("Incorrect restored table id") + .that(restoredTable.getId()) + .isEqualTo(tableId); + } } finally { tableAdmin.deleteBackup(targetCluster, backupId); tableAdmin.deleteTable(tableId); @@ -336,28 +298,33 @@ public void restoreTableTest() throws InterruptedException, ExecutionException { @Test public void backupIamTest() throws InterruptedException { String backupId = generateId("iam-" + TEST_BACKUP_SUFFIX); - createBackupAndWait(backupId); - Policy policy = tableAdmin.getBackupIamPolicy(targetCluster, backupId); - assertThat(policy).isNotNull(); - - Exception actualEx = null; try { - assertThat(tableAdmin.setBackupIamPolicy(targetCluster, backupId, policy)).isNotNull(); - } catch (Exception iamException) { - actualEx = iamException; + tableAdmin.createBackup(createBackupRequest(backupId)); + + Policy policy = tableAdmin.getBackupIamPolicy(targetCluster, backupId); + assertThat(policy).isNotNull(); + + Exception actualEx = null; + try { + assertThat(tableAdmin.setBackupIamPolicy(targetCluster, backupId, policy)).isNotNull(); + } catch (Exception iamException) { + actualEx = iamException; + } + assertThat(actualEx).isNull(); + + List permissions = + tableAdmin.testBackupIamPermission( + targetCluster, + backupId, + "bigtable.backups.get", + "bigtable.backups.delete", + "bigtable.backups.update", + "bigtable.backups.restore"); + assertThat(permissions).hasSize(4); + } finally { + tableAdmin.deleteBackup(targetCluster, backupId); } - assertThat(actualEx).isNull(); - - List permissions = - tableAdmin.testBackupIamPermission( - targetCluster, - backupId, - "bigtable.backups.get", - "bigtable.backups.delete", - "bigtable.backups.update", - "bigtable.backups.restore"); - assertThat(permissions).hasSize(4); } private CreateBackupRequest createBackupRequest(String backupName) { @@ -369,22 +336,4 @@ private CreateBackupRequest createBackupRequest(String backupName) { private static String generateId(String name) { return prefix + "-" + name; } - - private void createBackupAndWait(String backupId) throws InterruptedException { - tableAdmin.createBackup(createBackupRequest(backupId)); - for (int i = 0; i < BACKOFF_DURATION.length; i++) { - try { - Backup backup = tableAdmin.getBackup(targetCluster, backupId); - if (backup.getState() == Backup.State.READY) { - return; - } - } catch (ApiException ex) { - LOGGER.info("Wait for " + BACKOFF_DURATION[i] + " seconds for creating backup " + backupId); - } - - Thread.sleep(BACKOFF_DURATION[i] * 1000); - } - - fail("Creating Backup Timeout"); - } } From 62039e7f8b2844d57dffecb20fac70c571996dd6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 11 Nov 2020 23:50:37 +0100 Subject: [PATCH 4/9] chore(deps): update dependency com.google.cloud:google-cloud-bigtable to v1.17.3 (#527) --- samples/install-without-bom/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 5b22a72043..779ca79ea9 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigtable - 1.17.2 + 1.17.3 From 8c16fa4c5290f67c43392953095bd759c2505bdb Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 12 Nov 2020 07:26:53 -0800 Subject: [PATCH 5/9] feat(autogenerated): Update BigtableTableAdmin GetIamPolicy to include the additional binding for Backup, Change DeleteAppProfileRequest.ignore_warnings to REQUIRED. (#530) PiperOrigin-RevId: 339464550 Source-Author: Google APIs Source-Date: Wed Oct 28 08:32:48 2020 -0700 Source-Repo: googleapis/googleapis Source-Sha: ccd6462d31e6422fd188b6590aa8d0ad03e7d9a3 Source-Link: https://github.com/googleapis/googleapis/commit/ccd6462d31e6422fd188b6590aa8d0ad03e7d9a3 --- .../v2/BaseBigtableInstanceAdminClient.java | 4 + .../v2/BaseBigtableTableAdminClient.java | 45 +- .../v2/BaseBigtableTableAdminClientTest.java | 12 +- .../admin/v2/BigtableTableAdminGrpc.java | 64 +- .../admin/v2/BigtableInstanceAdminProto.java | 212 +++--- .../admin/v2/BigtableTableAdminProto.java | 610 +++++++++--------- .../admin/v2/CheckConsistencyRequest.java | 28 +- .../v2/CheckConsistencyRequestOrBuilder.java | 8 +- .../admin/v2/CreateBackupRequest.java | 6 +- .../v2/CreateTableFromSnapshotRequest.java | 70 +- ...eateTableFromSnapshotRequestOrBuilder.java | 20 +- .../bigtable/admin/v2/CreateTableRequest.java | 28 +- .../admin/v2/CreateTableRequestOrBuilder.java | 8 +- .../admin/v2/DeleteAppProfileRequest.java | 16 +- .../v2/DeleteAppProfileRequestOrBuilder.java | 4 +- .../admin/v2/DeleteBackupRequest.java | 6 +- .../v2/GenerateConsistencyTokenRequest.java | 28 +- ...erateConsistencyTokenRequestOrBuilder.java | 8 +- .../bigtable/admin/v2/GetBackupRequest.java | 6 +- .../bigtable/admin/v2/ListBackupsRequest.java | 118 ++-- .../admin/v2/ListBackupsRequestOrBuilder.java | 32 +- .../admin/v2/ListBackupsResponse.java | 34 +- .../v2/ListBackupsResponseOrBuilder.java | 8 +- .../admin/v2/ListSnapshotsRequest.java | 28 +- .../v2/ListSnapshotsRequestOrBuilder.java | 8 +- .../bigtable/admin/v2/ListTablesRequest.java | 28 +- .../admin/v2/ListTablesRequestOrBuilder.java | 8 +- .../admin/v2/ModifyColumnFamiliesRequest.java | 184 +++--- .../ModifyColumnFamiliesRequestOrBuilder.java | 40 +- .../admin/v2/RestoreTableMetadata.java | 36 +- .../v2/RestoreTableMetadataOrBuilder.java | 9 +- .../admin/v2/RestoreTableRequest.java | 70 +- .../v2/RestoreTableRequestOrBuilder.java | 20 +- .../admin/v2/SnapshotTableRequest.java | 42 +- .../v2/SnapshotTableRequestOrBuilder.java | 12 +- .../admin/v2/UpdateBackupRequest.java | 6 +- .../admin/v2/bigtable_instance_admin.proto | 11 +- .../admin/v2/bigtable_table_admin.proto | 327 +++++----- synth.metadata | 6 +- 39 files changed, 1112 insertions(+), 1098 deletions(-) diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java index bca97fdfab..21d398cb08 100644 --- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java +++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClient.java @@ -1725,8 +1725,10 @@ public final void deleteAppProfile(String name) { * 

    * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfileName name = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
+   *   boolean ignoreWarnings = false;
    *   DeleteAppProfileRequest request = DeleteAppProfileRequest.newBuilder()
    *     .setName(name.toString())
+   *     .setIgnoreWarnings(ignoreWarnings)
    *     .build();
    *   baseBigtableInstanceAdminClient.deleteAppProfile(request);
    * }
@@ -1748,8 +1750,10 @@ public final void deleteAppProfile(DeleteAppProfileRequest request) {
    * 

    * try (BaseBigtableInstanceAdminClient baseBigtableInstanceAdminClient = BaseBigtableInstanceAdminClient.create()) {
    *   AppProfileName name = AppProfileName.of("[PROJECT]", "[INSTANCE]", "[APP_PROFILE]");
+   *   boolean ignoreWarnings = false;
    *   DeleteAppProfileRequest request = DeleteAppProfileRequest.newBuilder()
    *     .setName(name.toString())
+   *     .setIgnoreWarnings(ignoreWarnings)
    *     .build();
    *   ApiFuture<Void> future = baseBigtableInstanceAdminClient.deleteAppProfileCallable().futureCall(request);
    *   // Do something
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java
index 4a5efaccd7..58730fafa5 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClient.java
@@ -1157,8 +1157,8 @@ public final CheckConsistencyResponse checkConsistency(CheckConsistencyRequest r
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets the access control policy for a resource. Returns an empty policy if the resource exists
-   * but does not have a policy set.
+   * Gets the access control policy for a Table or Backup resource. Returns an empty policy if the
+   * resource exists but does not have a policy set.
    *
    * 
Sample code:
    *
@@ -1183,8 +1183,8 @@ public final Policy getIamPolicy(ResourceName resource) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets the access control policy for a resource. Returns an empty policy if the resource exists
-   * but does not have a policy set.
+   * Gets the access control policy for a Table or Backup resource. Returns an empty policy if the
+   * resource exists but does not have a policy set.
    *
    * 
Sample code:
    *
@@ -1206,8 +1206,8 @@ public final Policy getIamPolicy(String resource) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets the access control policy for a resource. Returns an empty policy if the resource exists
-   * but does not have a policy set.
+   * Gets the access control policy for a Table or Backup resource. Returns an empty policy if the
+   * resource exists but does not have a policy set.
    *
    * 
Sample code:
    *
@@ -1230,8 +1230,8 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Gets the access control policy for a resource. Returns an empty policy if the resource exists
-   * but does not have a policy set.
+   * Gets the access control policy for a Table or Backup resource. Returns an empty policy if the
+   * resource exists but does not have a policy set.
    *
    * 
Sample code:
    *
@@ -1359,7 +1359,7 @@ public final UnaryCallable setIamPolicyCallable() {
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Returns permissions that the caller has on the specified table resource.
+   * Returns permissions that the caller has on the specified Table or Backup resource.
    *
    * 
Sample code:
    *
@@ -1390,7 +1390,7 @@ public final TestIamPermissionsResponse testIamPermissions(
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Returns permissions that the caller has on the specified table resource.
+   * Returns permissions that the caller has on the specified Table or Backup resource.
    *
    * 
Sample code:
    *
@@ -1421,7 +1421,7 @@ public final TestIamPermissionsResponse testIamPermissions(
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Returns permissions that the caller has on the specified table resource.
+   * Returns permissions that the caller has on the specified Table or Backup resource.
    *
    * 
Sample code:
    *
@@ -1446,7 +1446,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
 
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
-   * Returns permissions that the caller has on the specified table resource.
+   * Returns permissions that the caller has on the specified Table or Backup resource.
    *
    * 
Sample code:
    *
@@ -2646,7 +2646,12 @@ public final UnaryCallable deleteBackupCallable() {
    *
    * 

    * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
-   *   RestoreTableRequest request = RestoreTableRequest.newBuilder().build();
+   *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
+   *   String tableId = "";
+   *   RestoreTableRequest request = RestoreTableRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setTableId(tableId)
+   *     .build();
    *   Table response = baseBigtableTableAdminClient.restoreTableAsync(request).get();
    * }
    * 

@@ -2675,7 +2680,12 @@ public final OperationFuture restoreTableAsync(
    *
    * 

    * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
-   *   RestoreTableRequest request = RestoreTableRequest.newBuilder().build();
+   *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
+   *   String tableId = "";
+   *   RestoreTableRequest request = RestoreTableRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setTableId(tableId)
+   *     .build();
    *   OperationFuture<Table, RestoreTableMetadata> future = baseBigtableTableAdminClient.restoreTableOperationCallable().futureCall(request);
    *   // Do something
    *   Table response = future.get();
@@ -2702,7 +2712,12 @@ public final OperationFuture restoreTableAsync(
    *
    * 

    * try (BaseBigtableTableAdminClient baseBigtableTableAdminClient = BaseBigtableTableAdminClient.create()) {
-   *   RestoreTableRequest request = RestoreTableRequest.newBuilder().build();
+   *   InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
+   *   String tableId = "";
+   *   RestoreTableRequest request = RestoreTableRequest.newBuilder()
+   *     .setParent(parent.toString())
+   *     .setTableId(tableId)
+   *     .build();
    *   ApiFuture<Operation> future = baseBigtableTableAdminClient.restoreTableCallable().futureCall(request);
    *   // Do something
    *   Operation response = future.get();
diff --git a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java
index f11114b85b..33da842b53 100644
--- a/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java
+++ b/google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableTableAdminClientTest.java
@@ -1094,7 +1094,10 @@ public void restoreTableTest() throws Exception {
             .build();
     mockBigtableTableAdmin.addResponse(resultOperation);
 
-    RestoreTableRequest request = RestoreTableRequest.newBuilder().build();
+    InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
+    String tableId = "tableId-895419604";
+    RestoreTableRequest request =
+        RestoreTableRequest.newBuilder().setParent(parent.toString()).setTableId(tableId).build();
 
     Table actualResponse = client.restoreTableAsync(request).get();
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -1103,6 +1106,8 @@ public void restoreTableTest() throws Exception {
     Assert.assertEquals(1, actualRequests.size());
     RestoreTableRequest actualRequest = (RestoreTableRequest) actualRequests.get(0);
 
+    Assert.assertEquals(parent, InstanceName.parse(actualRequest.getParent()));
+    Assert.assertEquals(tableId, actualRequest.getTableId());
     Assert.assertTrue(
         channelProvider.isHeaderSent(
             ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
@@ -1116,7 +1121,10 @@ public void restoreTableExceptionTest() throws Exception {
     mockBigtableTableAdmin.addException(exception);
 
     try {
-      RestoreTableRequest request = RestoreTableRequest.newBuilder().build();
+      InstanceName parent = InstanceName.of("[PROJECT]", "[INSTANCE]");
+      String tableId = "tableId-895419604";
+      RestoreTableRequest request =
+          RestoreTableRequest.newBuilder().setParent(parent.toString()).setTableId(tableId).build();
 
       client.restoreTableAsync(request).get();
       Assert.fail("No exception raised");
diff --git a/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java b/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java
index aa360d4bde..aafc011eaf 100644
--- a/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java
+++ b/grpc-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminGrpc.java
@@ -1278,14 +1278,14 @@ public void deleteSnapshot(
      *
      *
      * 
-     * Starts creating a new Cloud Bigtable Backup. The returned backup
+     * Starts creating a new Cloud Bigtable Backup.  The returned backup
      * [long-running operation][google.longrunning.Operation] can be used to
      * track creation of the backup. The
      * [metadata][google.longrunning.Operation.metadata] field type is
      * [CreateBackupMetadata][google.bigtable.admin.v2.CreateBackupMetadata]. The
      * [response][google.longrunning.Operation.response] field type is
-     * [Backup][google.bigtable.admin.v2.Backup], if successful. Cancelling the
-     * returned operation will stop the creation and delete the backup.
+     * [Backup][google.bigtable.admin.v2.Backup], if successful. Cancelling the returned operation will stop the
+     * creation and delete the backup.
      * 

      */
     public void createBackup(
@@ -1353,11 +1353,11 @@ public void listBackups(
      *
      * 
      * Create a new table by restoring from a completed backup. The new table
-     * must be in the same instance as the instance containing the backup. The
+     * must be in the same instance as the instance containing the backup.  The
      * returned table [long-running operation][google.longrunning.Operation] can
-     * be used to track the progress of the operation, and to cancel it. The
+     * be used to track the progress of the operation, and to cancel it.  The
      * [metadata][google.longrunning.Operation.metadata] field type is
-     * [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
+     * [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata].  The
      * [response][google.longrunning.Operation.response] type is
      * [Table][google.bigtable.admin.v2.Table], if successful.
      * 

@@ -1372,7 +1372,7 @@ public void restoreTable(
      *
      *
      * 
-     * Gets the access control policy for a resource.
+     * Gets the access control policy for a Table or Backup resource.
      * Returns an empty policy if the resource exists but does not have a policy
      * set.
      * 

@@ -1401,7 +1401,7 @@ public void setIamPolicy(
      *
      *
      * 
-     * Returns permissions that the caller has on the specified table resource.
+     * Returns permissions that the caller has on the specified Table or Backup resource.
      * 

      */
     public void testIamPermissions(
@@ -1827,14 +1827,14 @@ public void deleteSnapshot(
      *
      *
      * 
-     * Starts creating a new Cloud Bigtable Backup. The returned backup
+     * Starts creating a new Cloud Bigtable Backup.  The returned backup
      * [long-running operation][google.longrunning.Operation] can be used to
      * track creation of the backup. The
      * [metadata][google.longrunning.Operation.metadata] field type is
      * [CreateBackupMetadata][google.bigtable.admin.v2.CreateBackupMetadata]. The
      * [response][google.longrunning.Operation.response] field type is
-     * [Backup][google.bigtable.admin.v2.Backup], if successful. Cancelling the
-     * returned operation will stop the creation and delete the backup.
+     * [Backup][google.bigtable.admin.v2.Backup], if successful. Cancelling the returned operation will stop the
+     * creation and delete the backup.
      * 

      */
     public void createBackup(
@@ -1915,11 +1915,11 @@ public void listBackups(
      *
      * 
      * Create a new table by restoring from a completed backup. The new table
-     * must be in the same instance as the instance containing the backup. The
+     * must be in the same instance as the instance containing the backup.  The
      * returned table [long-running operation][google.longrunning.Operation] can
-     * be used to track the progress of the operation, and to cancel it. The
+     * be used to track the progress of the operation, and to cancel it.  The
      * [metadata][google.longrunning.Operation.metadata] field type is
-     * [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
+     * [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata].  The
      * [response][google.longrunning.Operation.response] type is
      * [Table][google.bigtable.admin.v2.Table], if successful.
      * 

@@ -1937,7 +1937,7 @@ public void restoreTable(
      *
      *
      * 
-     * Gets the access control policy for a resource.
+     * Gets the access control policy for a Table or Backup resource.
      * Returns an empty policy if the resource exists but does not have a policy
      * set.
      * 

@@ -1972,7 +1972,7 @@ public void setIamPolicy(
      *
      *
      * 
-     * Returns permissions that the caller has on the specified table resource.
+     * Returns permissions that the caller has on the specified Table or Backup resource.
      * 

      */
     public void testIamPermissions(
@@ -2211,14 +2211,14 @@ public com.google.protobuf.Empty deleteSnapshot(
      *
      *
      * 
-     * Starts creating a new Cloud Bigtable Backup. The returned backup
+     * Starts creating a new Cloud Bigtable Backup.  The returned backup
      * [long-running operation][google.longrunning.Operation] can be used to
      * track creation of the backup. The
      * [metadata][google.longrunning.Operation.metadata] field type is
      * [CreateBackupMetadata][google.bigtable.admin.v2.CreateBackupMetadata]. The
      * [response][google.longrunning.Operation.response] field type is
-     * [Backup][google.bigtable.admin.v2.Backup], if successful. Cancelling the
-     * returned operation will stop the creation and delete the backup.
+     * [Backup][google.bigtable.admin.v2.Backup], if successful. Cancelling the returned operation will stop the
+     * creation and delete the backup.
      * 

      */
     public com.google.longrunning.Operation createBackup(
@@ -2280,11 +2280,11 @@ public com.google.bigtable.admin.v2.ListBackupsResponse listBackups(
      *
      * 
      * Create a new table by restoring from a completed backup. The new table
-     * must be in the same instance as the instance containing the backup. The
+     * must be in the same instance as the instance containing the backup.  The
      * returned table [long-running operation][google.longrunning.Operation] can
-     * be used to track the progress of the operation, and to cancel it. The
+     * be used to track the progress of the operation, and to cancel it.  The
      * [metadata][google.longrunning.Operation.metadata] field type is
-     * [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
+     * [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata].  The
      * [response][google.longrunning.Operation.response] type is
      * [Table][google.bigtable.admin.v2.Table], if successful.
      * 

@@ -2298,7 +2298,7 @@ public com.google.longrunning.Operation restoreTable(
      *
      *
      * 
-     * Gets the access control policy for a resource.
+     * Gets the access control policy for a Table or Backup resource.
      * Returns an empty policy if the resource exists but does not have a policy
      * set.
      * 

@@ -2323,7 +2323,7 @@ public com.google.iam.v1.Policy setIamPolicy(com.google.iam.v1.SetIamPolicyReque
      *
      *
      * 
-     * Returns permissions that the caller has on the specified table resource.
+     * Returns permissions that the caller has on the specified Table or Backup resource.
      * 

      */
     public com.google.iam.v1.TestIamPermissionsResponse testIamPermissions(
@@ -2571,14 +2571,14 @@ protected BigtableTableAdminFutureStub build(
      *
      *
      * 
-     * Starts creating a new Cloud Bigtable Backup. The returned backup
+     * Starts creating a new Cloud Bigtable Backup.  The returned backup
      * [long-running operation][google.longrunning.Operation] can be used to
      * track creation of the backup. The
      * [metadata][google.longrunning.Operation.metadata] field type is
      * [CreateBackupMetadata][google.bigtable.admin.v2.CreateBackupMetadata]. The
      * [response][google.longrunning.Operation.response] field type is
-     * [Backup][google.bigtable.admin.v2.Backup], if successful. Cancelling the
-     * returned operation will stop the creation and delete the backup.
+     * [Backup][google.bigtable.admin.v2.Backup], if successful. Cancelling the returned operation will stop the
+     * creation and delete the backup.
      * 

      */
     public com.google.common.util.concurrent.ListenableFuture
@@ -2645,11 +2645,11 @@ protected BigtableTableAdminFutureStub build(
      *
      * 
      * Create a new table by restoring from a completed backup. The new table
-     * must be in the same instance as the instance containing the backup. The
+     * must be in the same instance as the instance containing the backup.  The
      * returned table [long-running operation][google.longrunning.Operation] can
-     * be used to track the progress of the operation, and to cancel it. The
+     * be used to track the progress of the operation, and to cancel it.  The
      * [metadata][google.longrunning.Operation.metadata] field type is
-     * [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
+     * [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata].  The
      * [response][google.longrunning.Operation.response] type is
      * [Table][google.bigtable.admin.v2.Table], if successful.
      * 

@@ -2664,7 +2664,7 @@ protected BigtableTableAdminFutureStub build(
      *
      *
      * 
-     * Gets the access control policy for a resource.
+     * Gets the access control policy for a Table or Backup resource.
      * Returns an empty policy if the resource exists but does not have a policy
      * set.
      * 

@@ -2693,7 +2693,7 @@ protected BigtableTableAdminFutureStub build(
      *
      *
      * 
-     * Returns permissions that the caller has on the specified table resource.
+     * Returns permissions that the caller has on the specified Table or Backup resource.
      * 

      */
     public com.google.common.util.concurrent.ListenableFuture<
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java
index 158d7ecc07..0969a2efd3 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableInstanceAdminProto.java
@@ -212,113 +212,113 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ileRequest\022>\n\013app_profile\030\001 \001(\0132$.google"
           + ".bigtable.admin.v2.AppProfileB\003\340A\002\0224\n\013up"
           + "date_mask\030\002 \001(\0132\032.google.protobuf.FieldM"
-          + "askB\003\340A\002\022\027\n\017ignore_warnings\030\003 \001(\010\"l\n\027Del"
+          + "askB\003\340A\002\022\027\n\017ignore_warnings\030\003 \001(\010\"q\n\027Del"
           + "eteAppProfileRequest\0228\n\004name\030\001 \001(\tB*\340A\002\372"
-          + "A$\n\"bigtable.googleapis.com/AppProfile\022\027"
-          + "\n\017ignore_warnings\030\002 \001(\010\"\032\n\030UpdateAppProf"
-          + "ileMetadata2\222\036\n\025BigtableInstanceAdmin\022\332\001"
-          + "\n\016CreateInstance\022/.google.bigtable.admin"
-          + ".v2.CreateInstanceRequest\032\035.google.longr"
-          + "unning.Operation\"x\202\323\344\223\002&\"!/v2/{parent=pr"
-          + "ojects/*}/instances:\001*\332A$parent,instance"
-          + "_id,instance,clusters\312A\"\n\010Instance\022\026Crea"
-          + "teInstanceMetadata\022\221\001\n\013GetInstance\022,.goo"
-          + "gle.bigtable.admin.v2.GetInstanceRequest"
-          + "\032\".google.bigtable.admin.v2.Instance\"0\202\323"
-          + "\344\223\002#\022!/v2/{name=projects/*/instances/*}\332"
-          + "A\004name\022\244\001\n\rListInstances\022..google.bigtab"
-          + "le.admin.v2.ListInstancesRequest\032/.googl"
-          + "e.bigtable.admin.v2.ListInstancesRespons"
-          + "e\"2\202\323\344\223\002#\022!/v2/{parent=projects/*}/insta"
-          + "nces\332A\006parent\022\206\001\n\016UpdateInstance\022\".googl"
-          + "e.bigtable.admin.v2.Instance\032\".google.bi"
-          + "gtable.admin.v2.Instance\",\202\323\344\223\002&\032!/v2/{n"
-          + "ame=projects/*/instances/*}:\001*\022\350\001\n\025Parti"
-          + "alUpdateInstance\0226.google.bigtable.admin"
-          + ".v2.PartialUpdateInstanceRequest\032\035.googl"
-          + "e.longrunning.Operation\"x\202\323\344\223\00262*/v2/{in"
-          + "stance.name=projects/*/instances/*}:\010ins"
-          + "tance\332A\024instance,update_mask\312A\"\n\010Instanc"
-          + "e\022\026UpdateInstanceMetadata\022\213\001\n\016DeleteInst"
-          + "ance\022/.google.bigtable.admin.v2.DeleteIn"
-          + "stanceRequest\032\026.google.protobuf.Empty\"0\202"
-          + "\323\344\223\002#*!/v2/{name=projects/*/instances/*}"
-          + "\332A\004name\022\334\001\n\rCreateCluster\022..google.bigta"
-          + "ble.admin.v2.CreateClusterRequest\032\035.goog"
-          + "le.longrunning.Operation\"|\202\323\344\223\0027\",/v2/{p"
-          + "arent=projects/*/instances/*}/clusters:\007"
-          + "cluster\332A\031parent,cluster_id,cluster\312A \n\007"
-          + "Cluster\022\025CreateClusterMetadata\022\231\001\n\nGetCl"
-          + "uster\022+.google.bigtable.admin.v2.GetClus"
-          + "terRequest\032!.google.bigtable.admin.v2.Cl"
-          + "uster\";\202\323\344\223\002.\022,/v2/{name=projects/*/inst"
-          + "ances/*/clusters/*}\332A\004name\022\254\001\n\014ListClust"
-          + "ers\022-.google.bigtable.admin.v2.ListClust"
-          + "ersRequest\032..google.bigtable.admin.v2.Li"
-          + "stClustersResponse\"=\202\323\344\223\002.\022,/v2/{parent="
-          + "projects/*/instances/*}/clusters\332A\006paren"
-          + "t\022\255\001\n\rUpdateCluster\022!.google.bigtable.ad"
-          + "min.v2.Cluster\032\035.google.longrunning.Oper"
-          + "ation\"Z\202\323\344\223\0021\032,/v2/{name=projects/*/inst"
-          + "ances/*/clusters/*}:\001*\312A \n\007Cluster\022\025Upda"
-          + "teClusterMetadata\022\224\001\n\rDeleteCluster\022..go"
-          + "ogle.bigtable.admin.v2.DeleteClusterRequ"
-          + "est\032\026.google.protobuf.Empty\";\202\323\344\223\002.*,/v2"
-          + "/{name=projects/*/instances/*/clusters/*"
-          + "}\332A\004name\022\325\001\n\020CreateAppProfile\0221.google.b"
-          + "igtable.admin.v2.CreateAppProfileRequest"
-          + "\032$.google.bigtable.admin.v2.AppProfile\"h"
-          + "\202\323\344\223\002>\"//v2/{parent=projects/*/instances"
-          + "/*}/appProfiles:\013app_profile\332A!parent,ap"
-          + "p_profile_id,app_profile\022\245\001\n\rGetAppProfi"
-          + "le\022..google.bigtable.admin.v2.GetAppProf"
-          + "ileRequest\032$.google.bigtable.admin.v2.Ap"
-          + "pProfile\">\202\323\344\223\0021\022//v2/{name=projects/*/i"
-          + "nstances/*/appProfiles/*}\332A\004name\022\270\001\n\017Lis"
-          + "tAppProfiles\0220.google.bigtable.admin.v2."
-          + "ListAppProfilesRequest\0321.google.bigtable"
-          + ".admin.v2.ListAppProfilesResponse\"@\202\323\344\223\002"
-          + "1\022//v2/{parent=projects/*/instances/*}/a"
-          + "ppProfiles\332A\006parent\022\372\001\n\020UpdateAppProfile"
-          + "\0221.google.bigtable.admin.v2.UpdateAppPro"
-          + "fileRequest\032\035.google.longrunning.Operati"
-          + "on\"\223\001\202\323\344\223\002J2;/v2/{app_profile.name=proje"
-          + "cts/*/instances/*/appProfiles/*}:\013app_pr"
-          + "ofile\332A\027app_profile,update_mask\312A&\n\nAppP"
-          + "rofile\022\030UpdateAppProfileMetadata\022\235\001\n\020Del"
-          + "eteAppProfile\0221.google.bigtable.admin.v2"
-          + ".DeleteAppProfileRequest\032\026.google.protob"
-          + "uf.Empty\">\202\323\344\223\0021*//v2/{name=projects/*/i"
-          + "nstances/*/appProfiles/*}\332A\004name\022\223\001\n\014Get"
-          + "IamPolicy\022\".google.iam.v1.GetIamPolicyRe"
-          + "quest\032\025.google.iam.v1.Policy\"H\202\323\344\223\0027\"2/v"
-          + "2/{resource=projects/*/instances/*}:getI"
-          + "amPolicy:\001*\332A\010resource\022\232\001\n\014SetIamPolicy\022"
-          + "\".google.iam.v1.SetIamPolicyRequest\032\025.go"
-          + "ogle.iam.v1.Policy\"O\202\323\344\223\0027\"2/v2/{resourc"
-          + "e=projects/*/instances/*}:setIamPolicy:\001"
-          + "*\332A\017resource,policy\022\305\001\n\022TestIamPermissio"
-          + "ns\022(.google.iam.v1.TestIamPermissionsReq"
-          + "uest\032).google.iam.v1.TestIamPermissionsR"
-          + "esponse\"Z\202\323\344\223\002=\"8/v2/{resource=projects/"
-          + "*/instances/*}:testIamPermissions:\001*\332A\024r"
-          + "esource,permissions\032\232\003\312A\034bigtableadmin.g"
-          + "oogleapis.com\322A\367\002https://www.googleapis."
-          + "com/auth/bigtable.admin,https://www.goog"
-          + "leapis.com/auth/bigtable.admin.cluster,h"
-          + "ttps://www.googleapis.com/auth/bigtable."
-          + "admin.instance,https://www.googleapis.co"
-          + "m/auth/cloud-bigtable.admin,https://www."
-          + "googleapis.com/auth/cloud-bigtable.admin"
-          + ".cluster,https://www.googleapis.com/auth"
-          + "/cloud-platform,https://www.googleapis.c"
-          + "om/auth/cloud-platform.read-onlyB\342\001\n\034com"
-          + ".google.bigtable.admin.v2B\032BigtableInsta"
-          + "nceAdminProtoP\001Z=google.golang.org/genpr"
-          + "oto/googleapis/bigtable/admin/v2;admin\252\002"
-          + "\036Google.Cloud.Bigtable.Admin.V2\312\002\036Google"
-          + "\\Cloud\\Bigtable\\Admin\\V2\352\002\"Google::Cloud"
-          + "::Bigtable::Admin::V2b\006proto3"
+          + "A$\n\"bigtable.googleapis.com/AppProfile\022\034"
+          + "\n\017ignore_warnings\030\002 \001(\010B\003\340A\002\"\032\n\030UpdateAp"
+          + "pProfileMetadata2\222\036\n\025BigtableInstanceAdm"
+          + "in\022\332\001\n\016CreateInstance\022/.google.bigtable."
+          + "admin.v2.CreateInstanceRequest\032\035.google."
+          + "longrunning.Operation\"x\202\323\344\223\002&\"!/v2/{pare"
+          + "nt=projects/*}/instances:\001*\332A$parent,ins"
+          + "tance_id,instance,clusters\312A\"\n\010Instance\022"
+          + "\026CreateInstanceMetadata\022\221\001\n\013GetInstance\022"
+          + ",.google.bigtable.admin.v2.GetInstanceRe"
+          + "quest\032\".google.bigtable.admin.v2.Instanc"
+          + "e\"0\202\323\344\223\002#\022!/v2/{name=projects/*/instance"
+          + "s/*}\332A\004name\022\244\001\n\rListInstances\022..google.b"
+          + "igtable.admin.v2.ListInstancesRequest\032/."
+          + "google.bigtable.admin.v2.ListInstancesRe"
+          + "sponse\"2\202\323\344\223\002#\022!/v2/{parent=projects/*}/"
+          + "instances\332A\006parent\022\206\001\n\016UpdateInstance\022\"."
+          + "google.bigtable.admin.v2.Instance\032\".goog"
+          + "le.bigtable.admin.v2.Instance\",\202\323\344\223\002&\032!/"
+          + "v2/{name=projects/*/instances/*}:\001*\022\350\001\n\025"
+          + "PartialUpdateInstance\0226.google.bigtable."
+          + "admin.v2.PartialUpdateInstanceRequest\032\035."
+          + "google.longrunning.Operation\"x\202\323\344\223\00262*/v"
+          + "2/{instance.name=projects/*/instances/*}"
+          + ":\010instance\332A\024instance,update_mask\312A\"\n\010In"
+          + "stance\022\026UpdateInstanceMetadata\022\213\001\n\016Delet"
+          + "eInstance\022/.google.bigtable.admin.v2.Del"
+          + "eteInstanceRequest\032\026.google.protobuf.Emp"
+          + "ty\"0\202\323\344\223\002#*!/v2/{name=projects/*/instanc"
+          + "es/*}\332A\004name\022\334\001\n\rCreateCluster\022..google."
+          + "bigtable.admin.v2.CreateClusterRequest\032\035"
+          + ".google.longrunning.Operation\"|\202\323\344\223\0027\",/"
+          + "v2/{parent=projects/*/instances/*}/clust"
+          + "ers:\007cluster\332A\031parent,cluster_id,cluster"
+          + "\312A \n\007Cluster\022\025CreateClusterMetadata\022\231\001\n\n"
+          + "GetCluster\022+.google.bigtable.admin.v2.Ge"
+          + "tClusterRequest\032!.google.bigtable.admin."
+          + "v2.Cluster\";\202\323\344\223\002.\022,/v2/{name=projects/*"
+          + "/instances/*/clusters/*}\332A\004name\022\254\001\n\014List"
+          + "Clusters\022-.google.bigtable.admin.v2.List"
+          + "ClustersRequest\032..google.bigtable.admin."
+          + "v2.ListClustersResponse\"=\202\323\344\223\002.\022,/v2/{pa"
+          + "rent=projects/*/instances/*}/clusters\332A\006"
+          + "parent\022\255\001\n\rUpdateCluster\022!.google.bigtab"
+          + "le.admin.v2.Cluster\032\035.google.longrunning"
+          + ".Operation\"Z\202\323\344\223\0021\032,/v2/{name=projects/*"
+          + "/instances/*/clusters/*}:\001*\312A \n\007Cluster\022"
+          + "\025UpdateClusterMetadata\022\224\001\n\rDeleteCluster"
+          + "\022..google.bigtable.admin.v2.DeleteCluste"
+          + "rRequest\032\026.google.protobuf.Empty\";\202\323\344\223\002."
+          + "*,/v2/{name=projects/*/instances/*/clust"
+          + "ers/*}\332A\004name\022\325\001\n\020CreateAppProfile\0221.goo"
+          + "gle.bigtable.admin.v2.CreateAppProfileRe"
+          + "quest\032$.google.bigtable.admin.v2.AppProf"
+          + "ile\"h\202\323\344\223\002>\"//v2/{parent=projects/*/inst"
+          + "ances/*}/appProfiles:\013app_profile\332A!pare"
+          + "nt,app_profile_id,app_profile\022\245\001\n\rGetApp"
+          + "Profile\022..google.bigtable.admin.v2.GetAp"
+          + "pProfileRequest\032$.google.bigtable.admin."
+          + "v2.AppProfile\">\202\323\344\223\0021\022//v2/{name=project"
+          + "s/*/instances/*/appProfiles/*}\332A\004name\022\270\001"
+          + "\n\017ListAppProfiles\0220.google.bigtable.admi"
+          + "n.v2.ListAppProfilesRequest\0321.google.big"
+          + "table.admin.v2.ListAppProfilesResponse\"@"
+          + "\202\323\344\223\0021\022//v2/{parent=projects/*/instances"
+          + "/*}/appProfiles\332A\006parent\022\372\001\n\020UpdateAppPr"
+          + "ofile\0221.google.bigtable.admin.v2.UpdateA"
+          + "ppProfileRequest\032\035.google.longrunning.Op"
+          + "eration\"\223\001\202\323\344\223\002J2;/v2/{app_profile.name="
+          + "projects/*/instances/*/appProfiles/*}:\013a"
+          + "pp_profile\332A\027app_profile,update_mask\312A&\n"
+          + "\nAppProfile\022\030UpdateAppProfileMetadata\022\235\001"
+          + "\n\020DeleteAppProfile\0221.google.bigtable.adm"
+          + "in.v2.DeleteAppProfileRequest\032\026.google.p"
+          + "rotobuf.Empty\">\202\323\344\223\0021*//v2/{name=project"
+          + "s/*/instances/*/appProfiles/*}\332A\004name\022\223\001"
+          + "\n\014GetIamPolicy\022\".google.iam.v1.GetIamPol"
+          + "icyRequest\032\025.google.iam.v1.Policy\"H\202\323\344\223\002"
+          + "7\"2/v2/{resource=projects/*/instances/*}"
+          + ":getIamPolicy:\001*\332A\010resource\022\232\001\n\014SetIamPo"
+          + "licy\022\".google.iam.v1.SetIamPolicyRequest"
+          + "\032\025.google.iam.v1.Policy\"O\202\323\344\223\0027\"2/v2/{re"
+          + "source=projects/*/instances/*}:setIamPol"
+          + "icy:\001*\332A\017resource,policy\022\305\001\n\022TestIamPerm"
+          + "issions\022(.google.iam.v1.TestIamPermissio"
+          + "nsRequest\032).google.iam.v1.TestIamPermiss"
+          + "ionsResponse\"Z\202\323\344\223\002=\"8/v2/{resource=proj"
+          + "ects/*/instances/*}:testIamPermissions:\001"
+          + "*\332A\024resource,permissions\032\232\003\312A\034bigtablead"
+          + "min.googleapis.com\322A\367\002https://www.google"
+          + "apis.com/auth/bigtable.admin,https://www"
+          + ".googleapis.com/auth/bigtable.admin.clus"
+          + "ter,https://www.googleapis.com/auth/bigt"
+          + "able.admin.instance,https://www.googleap"
+          + "is.com/auth/cloud-bigtable.admin,https:/"
+          + "/www.googleapis.com/auth/cloud-bigtable."
+          + "admin.cluster,https://www.googleapis.com"
+          + "/auth/cloud-platform,https://www.googlea"
+          + "pis.com/auth/cloud-platform.read-onlyB\342\001"
+          + "\n\034com.google.bigtable.admin.v2B\032Bigtable"
+          + "InstanceAdminProtoP\001Z=google.golang.org/"
+          + "genproto/googleapis/bigtable/admin/v2;ad"
+          + "min\252\002\036Google.Cloud.Bigtable.Admin.V2\312\002\036G"
+          + "oogle\\Cloud\\Bigtable\\Admin\\V2\352\002\"Google::"
+          + "Cloud::Bigtable::Admin::V2b\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java
index 54c2a48db7..8c8bc4b006 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/BigtableTableAdminProto.java
@@ -27,6 +27,18 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
     registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry);
   }
 
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_bigtable_admin_v2_RestoreTableRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_bigtable_admin_v2_RestoreTableRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_bigtable_admin_v2_RestoreTableMetadata_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_bigtable_admin_v2_RestoreTableMetadata_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_bigtable_admin_v2_OptimizeRestoredTableMetadata_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_bigtable_admin_v2_OptimizeRestoredTableMetadata_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_bigtable_admin_v2_CreateTableRequest_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -119,14 +131,14 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_bigtable_admin_v2_CreateBackupMetadata_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_bigtable_admin_v2_CreateBackupMetadata_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_bigtable_admin_v2_GetBackupRequest_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_bigtable_admin_v2_GetBackupRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_bigtable_admin_v2_UpdateBackupRequest_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_bigtable_admin_v2_UpdateBackupRequest_fieldAccessorTable;
+  static final com.google.protobuf.Descriptors.Descriptor
+      internal_static_google_bigtable_admin_v2_GetBackupRequest_descriptor;
+  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+      internal_static_google_bigtable_admin_v2_GetBackupRequest_fieldAccessorTable;
   static final com.google.protobuf.Descriptors.Descriptor
       internal_static_google_bigtable_admin_v2_DeleteBackupRequest_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -139,18 +151,6 @@ public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry r
       internal_static_google_bigtable_admin_v2_ListBackupsResponse_descriptor;
   static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
       internal_static_google_bigtable_admin_v2_ListBackupsResponse_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_bigtable_admin_v2_RestoreTableRequest_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_bigtable_admin_v2_RestoreTableRequest_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_bigtable_admin_v2_RestoreTableMetadata_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_bigtable_admin_v2_RestoreTableMetadata_fieldAccessorTable;
-  static final com.google.protobuf.Descriptors.Descriptor
-      internal_static_google_bigtable_admin_v2_OptimizeRestoredTableMetadata_descriptor;
-  static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
-      internal_static_google_bigtable_admin_v2_OptimizeRestoredTableMetadata_fieldAccessorTable;
 
   public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
     return descriptor;
@@ -172,232 +172,236 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
           + "ns.proto\032\036google/protobuf/duration.proto"
           + "\032\033google/protobuf/empty.proto\032 google/pr"
           + "otobuf/field_mask.proto\032\037google/protobuf"
-          + "/timestamp.proto\"\374\001\n\022CreateTableRequest\022"
-          + "8\n\006parent\030\001 \001(\tB(\340A\002\372A\"\n bigtable.google"
-          + "apis.com/Instance\022\025\n\010table_id\030\002 \001(\tB\003\340A\002"
-          + "\0223\n\005table\030\003 \001(\0132\037.google.bigtable.admin."
-          + "v2.TableB\003\340A\002\022J\n\016initial_splits\030\004 \003(\01322."
-          + "google.bigtable.admin.v2.CreateTableRequ"
-          + "est.Split\032\024\n\005Split\022\013\n\003key\030\001 \001(\014\"\264\001\n\036Crea"
-          + "teTableFromSnapshotRequest\0228\n\006parent\030\001 \001"
-          + "(\tB(\340A\002\372A\"\n bigtable.googleapis.com/Inst"
-          + "ance\022\025\n\010table_id\030\002 \001(\tB\003\340A\002\022A\n\017source_sn"
-          + "apshot\030\003 \001(\tB(\340A\002\372A\"\n bigtable.googleapi"
-          + "s.com/Snapshot\"\224\001\n\023DropRowRangeRequest\0223"
-          + "\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035bigtable.googleapi"
-          + "s.com/Table\022\030\n\016row_key_prefix\030\002 \001(\014H\000\022$\n"
-          + "\032delete_all_data_from_table\030\003 \001(\010H\000B\010\n\006t"
-          + "arget\"\250\001\n\021ListTablesRequest\0228\n\006parent\030\001 "
-          + "\001(\tB(\340A\002\372A\"\n bigtable.googleapis.com/Ins"
-          + "tance\0222\n\004view\030\002 \001(\0162$.google.bigtable.ad"
-          + "min.v2.Table.View\022\021\n\tpage_size\030\004 \001(\005\022\022\n\n"
-          + "page_token\030\003 \001(\t\"^\n\022ListTablesResponse\022/"
-          + "\n\006tables\030\001 \003(\0132\037.google.bigtable.admin.v"
-          + "2.Table\022\027\n\017next_page_token\030\002 \001(\t\"z\n\017GetT"
-          + "ableRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035bigta"
-          + "ble.googleapis.com/Table\0222\n\004view\030\002 \001(\0162$"
-          + ".google.bigtable.admin.v2.Table.View\"I\n\022"
-          + "DeleteTableRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037"
-          + "\n\035bigtable.googleapis.com/Table\"\332\002\n\033Modi"
-          + "fyColumnFamiliesRequest\0223\n\004name\030\001 \001(\tB%\340"
-          + "A\002\372A\037\n\035bigtable.googleapis.com/Table\022^\n\r"
-          + "modifications\030\002 \003(\0132B.google.bigtable.ad"
-          + "min.v2.ModifyColumnFamiliesRequest.Modif"
-          + "icationB\003\340A\002\032\245\001\n\014Modification\022\n\n\002id\030\001 \001("
-          + "\t\0228\n\006create\030\002 \001(\0132&.google.bigtable.admi"
-          + "n.v2.ColumnFamilyH\000\0228\n\006update\030\003 \001(\0132&.go"
-          + "ogle.bigtable.admin.v2.ColumnFamilyH\000\022\016\n"
-          + "\004drop\030\004 \001(\010H\000B\005\n\003mod\"V\n\037GenerateConsiste"
-          + "ncyTokenRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035b"
-          + "igtable.googleapis.com/Table\"=\n Generate"
-          + "ConsistencyTokenResponse\022\031\n\021consistency_"
-          + "token\030\001 \001(\t\"n\n\027CheckConsistencyRequest\0223"
-          + "\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035bigtable.googleapi"
-          + "s.com/Table\022\036\n\021consistency_token\030\002 \001(\tB\003"
-          + "\340A\002\".\n\030CheckConsistencyResponse\022\022\n\nconsi"
-          + "stent\030\001 \001(\010\"\334\001\n\024SnapshotTableRequest\0223\n\004"
-          + "name\030\001 \001(\tB%\340A\002\372A\037\n\035bigtable.googleapis."
-          + "com/Table\0228\n\007cluster\030\002 \001(\tB\'\340A\002\372A!\n\037bigt"
-          + "able.googleapis.com/Cluster\022\030\n\013snapshot_"
-          + "id\030\003 \001(\tB\003\340A\002\022&\n\003ttl\030\004 \001(\0132\031.google.prot"
-          + "obuf.Duration\022\023\n\013description\030\005 \001(\t\"L\n\022Ge"
-          + "tSnapshotRequest\0226\n\004name\030\001 \001(\tB(\340A\002\372A\"\n "
-          + "bigtable.googleapis.com/Snapshot\"v\n\024List"
-          + "SnapshotsRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372A!"
-          + "\n\037bigtable.googleapis.com/Cluster\022\021\n\tpag"
-          + "e_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"g\n\025List"
-          + "SnapshotsResponse\0225\n\tsnapshots\030\001 \003(\0132\".g"
-          + "oogle.bigtable.admin.v2.Snapshot\022\027\n\017next"
-          + "_page_token\030\002 \001(\t\"O\n\025DeleteSnapshotReque"
-          + "st\0226\n\004name\030\001 \001(\tB(\340A\002\372A\"\n bigtable.googl"
-          + "eapis.com/Snapshot\"\304\001\n\025SnapshotTableMeta"
-          + "data\022H\n\020original_request\030\001 \001(\0132..google."
-          + "bigtable.admin.v2.SnapshotTableRequest\0220"
-          + "\n\014request_time\030\002 \001(\0132\032.google.protobuf.T"
-          + "imestamp\022/\n\013finish_time\030\003 \001(\0132\032.google.p"
-          + "rotobuf.Timestamp\"\330\001\n\037CreateTableFromSna"
-          + "pshotMetadata\022R\n\020original_request\030\001 \001(\0132"
-          + "8.google.bigtable.admin.v2.CreateTableFr"
-          + "omSnapshotRequest\0220\n\014request_time\030\002 \001(\0132"
-          + "\032.google.protobuf.Timestamp\022/\n\013finish_ti"
-          + "me\030\003 \001(\0132\032.google.protobuf.Timestamp\"\235\001\n"
-          + "\023CreateBackupRequest\0227\n\006parent\030\001 \001(\tB\'\340A"
-          + "\002\372A!\n\037bigtable.googleapis.com/Cluster\022\026\n"
-          + "\tbackup_id\030\002 \001(\tB\003\340A\002\0225\n\006backup\030\003 \001(\0132 ."
-          + "google.bigtable.admin.v2.BackupB\003\340A\002\"\230\001\n"
-          + "\024CreateBackupMetadata\022\014\n\004name\030\001 \001(\t\022\024\n\014s"
-          + "ource_table\030\002 \001(\t\022.\n\nstart_time\030\003 \001(\0132\032."
-          + "google.protobuf.Timestamp\022,\n\010end_time\030\004 "
-          + "\001(\0132\032.google.protobuf.Timestamp\"H\n\020GetBa"
-          + "ckupRequest\0224\n\004name\030\001 \001(\tB&\340A\002\372A \n\036bigta"
-          + "ble.googleapis.com/Backup\"\202\001\n\023UpdateBack"
-          + "upRequest\0225\n\006backup\030\001 \001(\0132 .google.bigta"
-          + "ble.admin.v2.BackupB\003\340A\002\0224\n\013update_mask\030"
-          + "\002 \001(\0132\032.google.protobuf.FieldMaskB\003\340A\002\"K"
-          + "\n\023DeleteBackupRequest\0224\n\004name\030\001 \001(\tB&\340A\002"
-          + "\372A \n\036bigtable.googleapis.com/Backup\"\226\001\n\022"
-          + "ListBackupsRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002\372"
-          + "A!\n\037bigtable.googleapis.com/Cluster\022\016\n\006f"
-          + "ilter\030\002 \001(\t\022\020\n\010order_by\030\003 \001(\t\022\021\n\tpage_si"
-          + "ze\030\004 \001(\005\022\022\n\npage_token\030\005 \001(\t\"a\n\023ListBack"
-          + "upsResponse\0221\n\007backups\030\001 \003(\0132 .google.bi"
-          + "gtable.admin.v2.Backup\022\027\n\017next_page_toke"
-          + "n\030\002 \001(\t\"S\n\023RestoreTableRequest\022\016\n\006parent"
-          + "\030\001 \001(\t\022\020\n\010table_id\030\002 \001(\t\022\020\n\006backup\030\003 \001(\t"
-          + "H\000B\010\n\006source\"\230\002\n\024RestoreTableMetadata\022\014\n"
-          + "\004name\030\001 \001(\t\022@\n\013source_type\030\002 \001(\0162+.googl"
-          + "e.bigtable.admin.v2.RestoreSourceType\022;\n"
-          + "\013backup_info\030\003 \001(\0132$.google.bigtable.adm"
-          + "in.v2.BackupInfoH\000\022%\n\035optimize_table_ope"
-          + "ration_name\030\004 \001(\t\022=\n\010progress\030\005 \001(\0132+.go"
-          + "ogle.bigtable.admin.v2.OperationProgress"
-          + "B\r\n\013source_info\"l\n\035OptimizeRestoredTable"
-          + "Metadata\022\014\n\004name\030\001 \001(\t\022=\n\010progress\030\002 \001(\013"
-          + "2+.google.bigtable.admin.v2.OperationPro"
-          + "gress2\310$\n\022BigtableTableAdmin\022\253\001\n\013CreateT"
-          + "able\022,.google.bigtable.admin.v2.CreateTa"
-          + "bleRequest\032\037.google.bigtable.admin.v2.Ta"
-          + "ble\"M\202\323\344\223\002/\"*/v2/{parent=projects/*/inst"
-          + "ances/*}/tables:\001*\332A\025parent,table_id,tab"
-          + "le\022\212\002\n\027CreateTableFromSnapshot\0228.google."
-          + "bigtable.admin.v2.CreateTableFromSnapsho"
-          + "tRequest\032\035.google.longrunning.Operation\""
-          + "\225\001\202\323\344\223\002B\"=/v2/{parent=projects/*/instanc"
-          + "es/*}/tables:createFromSnapshot:\001*\332A\037par"
-          + "ent,table_id,source_snapshot\312A(\n\005Table\022\037"
-          + "CreateTableFromSnapshotMetadata\022\244\001\n\nList"
-          + "Tables\022+.google.bigtable.admin.v2.ListTa"
-          + "blesRequest\032,.google.bigtable.admin.v2.L"
-          + "istTablesResponse\";\202\323\344\223\002,\022*/v2/{parent=p"
-          + "rojects/*/instances/*}/tables\332A\006parent\022\221"
-          + "\001\n\010GetTable\022).google.bigtable.admin.v2.G"
-          + "etTableRequest\032\037.google.bigtable.admin.v"
-          + "2.Table\"9\202\323\344\223\002,\022*/v2/{name=projects/*/in"
-          + "stances/*/tables/*}\332A\004name\022\216\001\n\013DeleteTab"
-          + "le\022,.google.bigtable.admin.v2.DeleteTabl"
-          + "eRequest\032\026.google.protobuf.Empty\"9\202\323\344\223\002,"
-          + "**/v2/{name=projects/*/instances/*/table"
-          + "s/*}\332A\004name\022\317\001\n\024ModifyColumnFamilies\0225.g"
-          + "oogle.bigtable.admin.v2.ModifyColumnFami"
-          + "liesRequest\032\037.google.bigtable.admin.v2.T"
-          + "able\"_\202\323\344\223\002D\"?/v2/{name=projects/*/insta"
-          + "nces/*/tables/*}:modifyColumnFamilies:\001*"
-          + "\332A\022name,modifications\022\231\001\n\014DropRowRange\022-"
-          + ".google.bigtable.admin.v2.DropRowRangeRe"
-          + "quest\032\026.google.protobuf.Empty\"B\202\323\344\223\002<\"7/"
-          + "v2/{name=projects/*/instances/*/tables/*"
-          + "}:dropRowRange:\001*\022\350\001\n\030GenerateConsistenc"
-          + "yToken\0229.google.bigtable.admin.v2.Genera"
-          + "teConsistencyTokenRequest\032:.google.bigta"
-          + "ble.admin.v2.GenerateConsistencyTokenRes"
-          + "ponse\"U\202\323\344\223\002H\"C/v2/{name=projects/*/inst"
-          + "ances/*/tables/*}:generateConsistencyTok"
-          + "en:\001*\332A\004name\022\332\001\n\020CheckConsistency\0221.goog"
-          + "le.bigtable.admin.v2.CheckConsistencyReq"
-          + "uest\0322.google.bigtable.admin.v2.CheckCon"
-          + "sistencyResponse\"_\202\323\344\223\002@\";/v2/{name=proj"
-          + "ects/*/instances/*/tables/*}:checkConsis"
-          + "tency:\001*\332A\026name,consistency_token\022\352\001\n\rSn"
-          + "apshotTable\022..google.bigtable.admin.v2.S"
-          + "napshotTableRequest\032\035.google.longrunning"
-          + ".Operation\"\211\001\202\323\344\223\0028\"3/v2/{name=projects/"
-          + "*/instances/*/tables/*}:snapshot:\001*\332A$na"
-          + "me,cluster,snapshot_id,description\312A!\n\010S"
-          + "napshot\022\025SnapshotTableMetadata\022\250\001\n\013GetSn"
-          + "apshot\022,.google.bigtable.admin.v2.GetSna"
-          + "pshotRequest\032\".google.bigtable.admin.v2."
-          + "Snapshot\"G\202\323\344\223\002:\0228/v2/{name=projects/*/i"
+          + "/timestamp.proto\"\247\001\n\023RestoreTableRequest"
+          + "\0228\n\006parent\030\001 \001(\tB(\340A\002\372A\"\n bigtable.googl"
+          + "eapis.com/Instance\022\025\n\010table_id\030\002 \001(\tB\003\340A"
+          + "\002\0225\n\006backup\030\003 \001(\tB#\372A \n\036bigtable.googlea"
+          + "pis.com/BackupH\000B\010\n\006source\"\230\002\n\024RestoreTa"
+          + "bleMetadata\022\014\n\004name\030\001 \001(\t\022@\n\013source_type"
+          + "\030\002 \001(\0162+.google.bigtable.admin.v2.Restor"
+          + "eSourceType\022;\n\013backup_info\030\003 \001(\0132$.googl"
+          + "e.bigtable.admin.v2.BackupInfoH\000\022%\n\035opti"
+          + "mize_table_operation_name\030\004 \001(\t\022=\n\010progr"
+          + "ess\030\005 \001(\0132+.google.bigtable.admin.v2.Ope"
+          + "rationProgressB\r\n\013source_info\"l\n\035Optimiz"
+          + "eRestoredTableMetadata\022\014\n\004name\030\001 \001(\t\022=\n\010"
+          + "progress\030\002 \001(\0132+.google.bigtable.admin.v"
+          + "2.OperationProgress\"\374\001\n\022CreateTableReque"
+          + "st\0228\n\006parent\030\001 \001(\tB(\340A\002\372A\"\n bigtable.goo"
+          + "gleapis.com/Instance\022\025\n\010table_id\030\002 \001(\tB\003"
+          + "\340A\002\0223\n\005table\030\003 \001(\0132\037.google.bigtable.adm"
+          + "in.v2.TableB\003\340A\002\022J\n\016initial_splits\030\004 \003(\013"
+          + "22.google.bigtable.admin.v2.CreateTableR"
+          + "equest.Split\032\024\n\005Split\022\013\n\003key\030\001 \001(\014\"\264\001\n\036C"
+          + "reateTableFromSnapshotRequest\0228\n\006parent\030"
+          + "\001 \001(\tB(\340A\002\372A\"\n bigtable.googleapis.com/I"
+          + "nstance\022\025\n\010table_id\030\002 \001(\tB\003\340A\002\022A\n\017source"
+          + "_snapshot\030\003 \001(\tB(\340A\002\372A\"\n bigtable.google"
+          + "apis.com/Snapshot\"\224\001\n\023DropRowRangeReques"
+          + "t\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035bigtable.google"
+          + "apis.com/Table\022\030\n\016row_key_prefix\030\002 \001(\014H\000"
+          + "\022$\n\032delete_all_data_from_table\030\003 \001(\010H\000B\010"
+          + "\n\006target\"\250\001\n\021ListTablesRequest\0228\n\006parent"
+          + "\030\001 \001(\tB(\340A\002\372A\"\n bigtable.googleapis.com/"
+          + "Instance\0222\n\004view\030\002 \001(\0162$.google.bigtable"
+          + ".admin.v2.Table.View\022\021\n\tpage_size\030\004 \001(\005\022"
+          + "\022\n\npage_token\030\003 \001(\t\"^\n\022ListTablesRespons"
+          + "e\022/\n\006tables\030\001 \003(\0132\037.google.bigtable.admi"
+          + "n.v2.Table\022\027\n\017next_page_token\030\002 \001(\t\"z\n\017G"
+          + "etTableRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035bi"
+          + "gtable.googleapis.com/Table\0222\n\004view\030\002 \001("
+          + "\0162$.google.bigtable.admin.v2.Table.View\""
+          + "I\n\022DeleteTableRequest\0223\n\004name\030\001 \001(\tB%\340A\002"
+          + "\372A\037\n\035bigtable.googleapis.com/Table\"\332\002\n\033M"
+          + "odifyColumnFamiliesRequest\0223\n\004name\030\001 \001(\t"
+          + "B%\340A\002\372A\037\n\035bigtable.googleapis.com/Table\022"
+          + "^\n\rmodifications\030\002 \003(\0132B.google.bigtable"
+          + ".admin.v2.ModifyColumnFamiliesRequest.Mo"
+          + "dificationB\003\340A\002\032\245\001\n\014Modification\022\n\n\002id\030\001"
+          + " \001(\t\0228\n\006create\030\002 \001(\0132&.google.bigtable.a"
+          + "dmin.v2.ColumnFamilyH\000\0228\n\006update\030\003 \001(\0132&"
+          + ".google.bigtable.admin.v2.ColumnFamilyH\000"
+          + "\022\016\n\004drop\030\004 \001(\010H\000B\005\n\003mod\"V\n\037GenerateConsi"
+          + "stencyTokenRequest\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037"
+          + "\n\035bigtable.googleapis.com/Table\"=\n Gener"
+          + "ateConsistencyTokenResponse\022\031\n\021consisten"
+          + "cy_token\030\001 \001(\t\"n\n\027CheckConsistencyReques"
+          + "t\0223\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035bigtable.google"
+          + "apis.com/Table\022\036\n\021consistency_token\030\002 \001("
+          + "\tB\003\340A\002\".\n\030CheckConsistencyResponse\022\022\n\nco"
+          + "nsistent\030\001 \001(\010\"\334\001\n\024SnapshotTableRequest\022"
+          + "3\n\004name\030\001 \001(\tB%\340A\002\372A\037\n\035bigtable.googleap"
+          + "is.com/Table\0228\n\007cluster\030\002 \001(\tB\'\340A\002\372A!\n\037b"
+          + "igtable.googleapis.com/Cluster\022\030\n\013snapsh"
+          + "ot_id\030\003 \001(\tB\003\340A\002\022&\n\003ttl\030\004 \001(\0132\031.google.p"
+          + "rotobuf.Duration\022\023\n\013description\030\005 \001(\t\"L\n"
+          + "\022GetSnapshotRequest\0226\n\004name\030\001 \001(\tB(\340A\002\372A"
+          + "\"\n bigtable.googleapis.com/Snapshot\"v\n\024L"
+          + "istSnapshotsRequest\0227\n\006parent\030\001 \001(\tB\'\340A\002"
+          + "\372A!\n\037bigtable.googleapis.com/Cluster\022\021\n\t"
+          + "page_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\"g\n\025L"
+          + "istSnapshotsResponse\0225\n\tsnapshots\030\001 \003(\0132"
+          + "\".google.bigtable.admin.v2.Snapshot\022\027\n\017n"
+          + "ext_page_token\030\002 \001(\t\"O\n\025DeleteSnapshotRe"
+          + "quest\0226\n\004name\030\001 \001(\tB(\340A\002\372A\"\n bigtable.go"
+          + "ogleapis.com/Snapshot\"\304\001\n\025SnapshotTableM"
+          + "etadata\022H\n\020original_request\030\001 \001(\0132..goog"
+          + "le.bigtable.admin.v2.SnapshotTableReques"
+          + "t\0220\n\014request_time\030\002 \001(\0132\032.google.protobu"
+          + "f.Timestamp\022/\n\013finish_time\030\003 \001(\0132\032.googl"
+          + "e.protobuf.Timestamp\"\330\001\n\037CreateTableFrom"
+          + "SnapshotMetadata\022R\n\020original_request\030\001 \001"
+          + "(\01328.google.bigtable.admin.v2.CreateTabl"
+          + "eFromSnapshotRequest\0220\n\014request_time\030\002 \001"
+          + "(\0132\032.google.protobuf.Timestamp\022/\n\013finish"
+          + "_time\030\003 \001(\0132\032.google.protobuf.Timestamp\""
+          + "\235\001\n\023CreateBackupRequest\0227\n\006parent\030\001 \001(\tB"
+          + "\'\340A\002\372A!\n\037bigtable.googleapis.com/Cluster"
+          + "\022\026\n\tbackup_id\030\002 \001(\tB\003\340A\002\0225\n\006backup\030\003 \001(\013"
+          + "2 .google.bigtable.admin.v2.BackupB\003\340A\002\""
+          + "\230\001\n\024CreateBackupMetadata\022\014\n\004name\030\001 \001(\t\022\024"
+          + "\n\014source_table\030\002 \001(\t\022.\n\nstart_time\030\003 \001(\013"
+          + "2\032.google.protobuf.Timestamp\022,\n\010end_time"
+          + "\030\004 \001(\0132\032.google.protobuf.Timestamp\"\202\001\n\023U"
+          + "pdateBackupRequest\0225\n\006backup\030\001 \001(\0132 .goo"
+          + "gle.bigtable.admin.v2.BackupB\003\340A\002\0224\n\013upd"
+          + "ate_mask\030\002 \001(\0132\032.google.protobuf.FieldMa"
+          + "skB\003\340A\002\"H\n\020GetBackupRequest\0224\n\004name\030\001 \001("
+          + "\tB&\340A\002\372A \n\036bigtable.googleapis.com/Backu"
+          + "p\"K\n\023DeleteBackupRequest\0224\n\004name\030\001 \001(\tB&"
+          + "\340A\002\372A \n\036bigtable.googleapis.com/Backup\"\226"
+          + "\001\n\022ListBackupsRequest\0227\n\006parent\030\001 \001(\tB\'\340"
+          + "A\002\372A!\n\037bigtable.googleapis.com/Cluster\022\016"
+          + "\n\006filter\030\002 \001(\t\022\020\n\010order_by\030\003 \001(\t\022\021\n\tpage"
+          + "_size\030\004 \001(\005\022\022\n\npage_token\030\005 \001(\t\"a\n\023ListB"
+          + "ackupsResponse\0221\n\007backups\030\001 \003(\0132 .google"
+          + ".bigtable.admin.v2.Backup\022\027\n\017next_page_t"
+          + "oken\030\002 \001(\t2\230%\n\022BigtableTableAdmin\022\253\001\n\013Cr"
+          + "eateTable\022,.google.bigtable.admin.v2.Cre"
+          + "ateTableRequest\032\037.google.bigtable.admin."
+          + "v2.Table\"M\202\323\344\223\002/\"*/v2/{parent=projects/*"
+          + "/instances/*}/tables:\001*\332A\025parent,table_i"
+          + "d,table\022\212\002\n\027CreateTableFromSnapshot\0228.go"
+          + "ogle.bigtable.admin.v2.CreateTableFromSn"
+          + "apshotRequest\032\035.google.longrunning.Opera"
+          + "tion\"\225\001\202\323\344\223\002B\"=/v2/{parent=projects/*/in"
+          + "stances/*}/tables:createFromSnapshot:\001*\332"
+          + "A\037parent,table_id,source_snapshot\312A(\n\005Ta"
+          + "ble\022\037CreateTableFromSnapshotMetadata\022\244\001\n"
+          + "\nListTables\022+.google.bigtable.admin.v2.L"
+          + "istTablesRequest\032,.google.bigtable.admin"
+          + ".v2.ListTablesResponse\";\202\323\344\223\002,\022*/v2/{par"
+          + "ent=projects/*/instances/*}/tables\332A\006par"
+          + "ent\022\221\001\n\010GetTable\022).google.bigtable.admin"
+          + ".v2.GetTableRequest\032\037.google.bigtable.ad"
+          + "min.v2.Table\"9\202\323\344\223\002,\022*/v2/{name=projects"
+          + "/*/instances/*/tables/*}\332A\004name\022\216\001\n\013Dele"
+          + "teTable\022,.google.bigtable.admin.v2.Delet"
+          + "eTableRequest\032\026.google.protobuf.Empty\"9\202"
+          + "\323\344\223\002,**/v2/{name=projects/*/instances/*/"
+          + "tables/*}\332A\004name\022\317\001\n\024ModifyColumnFamilie"
+          + "s\0225.google.bigtable.admin.v2.ModifyColum"
+          + "nFamiliesRequest\032\037.google.bigtable.admin"
+          + ".v2.Table\"_\202\323\344\223\002D\"?/v2/{name=projects/*/"
+          + "instances/*/tables/*}:modifyColumnFamili"
+          + "es:\001*\332A\022name,modifications\022\231\001\n\014DropRowRa"
+          + "nge\022-.google.bigtable.admin.v2.DropRowRa"
+          + "ngeRequest\032\026.google.protobuf.Empty\"B\202\323\344\223"
+          + "\002<\"7/v2/{name=projects/*/instances/*/tab"
+          + "les/*}:dropRowRange:\001*\022\350\001\n\030GenerateConsi"
+          + "stencyToken\0229.google.bigtable.admin.v2.G"
+          + "enerateConsistencyTokenRequest\032:.google."
+          + "bigtable.admin.v2.GenerateConsistencyTok"
+          + "enResponse\"U\202\323\344\223\002H\"C/v2/{name=projects/*"
+          + "/instances/*/tables/*}:generateConsisten"
+          + "cyToken:\001*\332A\004name\022\332\001\n\020CheckConsistency\0221"
+          + ".google.bigtable.admin.v2.CheckConsisten"
+          + "cyRequest\0322.google.bigtable.admin.v2.Che"
+          + "ckConsistencyResponse\"_\202\323\344\223\002@\";/v2/{name"
+          + "=projects/*/instances/*/tables/*}:checkC"
+          + "onsistency:\001*\332A\026name,consistency_token\022\352"
+          + "\001\n\rSnapshotTable\022..google.bigtable.admin"
+          + ".v2.SnapshotTableRequest\032\035.google.longru"
+          + "nning.Operation\"\211\001\202\323\344\223\0028\"3/v2/{name=proj"
+          + "ects/*/instances/*/tables/*}:snapshot:\001*"
+          + "\332A$name,cluster,snapshot_id,description\312"
+          + "A!\n\010Snapshot\022\025SnapshotTableMetadata\022\250\001\n\013"
+          + "GetSnapshot\022,.google.bigtable.admin.v2.G"
+          + "etSnapshotRequest\032\".google.bigtable.admi"
+          + "n.v2.Snapshot\"G\202\323\344\223\002:\0228/v2/{name=project"
+          + "s/*/instances/*/clusters/*/snapshots/*}\332"
+          + "A\004name\022\273\001\n\rListSnapshots\022..google.bigtab"
+          + "le.admin.v2.ListSnapshotsRequest\032/.googl"
+          + "e.bigtable.admin.v2.ListSnapshotsRespons"
+          + "e\"I\202\323\344\223\002:\0228/v2/{parent=projects/*/instan"
+          + "ces/*/clusters/*}/snapshots\332A\006parent\022\242\001\n"
+          + "\016DeleteSnapshot\022/.google.bigtable.admin."
+          + "v2.DeleteSnapshotRequest\032\026.google.protob"
+          + "uf.Empty\"G\202\323\344\223\002:*8/v2/{name=projects/*/i"
           + "nstances/*/clusters/*/snapshots/*}\332A\004nam"
-          + "e\022\273\001\n\rListSnapshots\022..google.bigtable.ad"
-          + "min.v2.ListSnapshotsRequest\032/.google.big"
-          + "table.admin.v2.ListSnapshotsResponse\"I\202\323"
-          + "\344\223\002:\0228/v2/{parent=projects/*/instances/*"
-          + "/clusters/*}/snapshots\332A\006parent\022\242\001\n\016Dele"
-          + "teSnapshot\022/.google.bigtable.admin.v2.De"
-          + "leteSnapshotRequest\032\026.google.protobuf.Em"
-          + "pty\"G\202\323\344\223\002:*8/v2/{name=projects/*/instan"
-          + "ces/*/clusters/*/snapshots/*}\332A\004name\022\340\001\n"
-          + "\014CreateBackup\022-.google.bigtable.admin.v2"
-          + ".CreateBackupRequest\032\035.google.longrunnin"
-          + "g.Operation\"\201\001\202\323\344\223\002@\"6/v2/{parent=projec"
-          + "ts/*/instances/*/clusters/*}/backups:\006ba"
-          + "ckup\312A\036\n\006Backup\022\024CreateBackupMetadata\332A\027"
-          + "parent,backup_id,backup\022\240\001\n\tGetBackup\022*."
-          + "google.bigtable.admin.v2.GetBackupReques"
-          + "t\032 .google.bigtable.admin.v2.Backup\"E\202\323\344"
-          + "\223\0028\0226/v2/{name=projects/*/instances/*/cl"
-          + "usters/*/backups/*}\332A\004name\022\303\001\n\014UpdateBac"
-          + "kup\022-.google.bigtable.admin.v2.UpdateBac"
-          + "kupRequest\032 .google.bigtable.admin.v2.Ba"
-          + "ckup\"b\202\323\344\223\002G2=/v2/{backup.name=projects/"
-          + "*/instances/*/clusters/*/backups/*}:\006bac"
-          + "kup\332A\022backup,update_mask\022\234\001\n\014DeleteBacku"
-          + "p\022-.google.bigtable.admin.v2.DeleteBacku"
-          + "pRequest\032\026.google.protobuf.Empty\"E\202\323\344\223\0028"
-          + "*6/v2/{name=projects/*/instances/*/clust"
-          + "ers/*/backups/*}\332A\004name\022\263\001\n\013ListBackups\022"
-          + ",.google.bigtable.admin.v2.ListBackupsRe"
-          + "quest\032-.google.bigtable.admin.v2.ListBac"
-          + "kupsResponse\"G\202\323\344\223\0028\0226/v2/{parent=projec"
-          + "ts/*/instances/*/clusters/*}/backups\332A\006p"
-          + "arent\022\273\001\n\014RestoreTable\022-.google.bigtable"
-          + ".admin.v2.RestoreTableRequest\032\035.google.l"
-          + "ongrunning.Operation\"]\202\323\344\223\0027\"2/v2/{paren"
-          + "t=projects/*/instances/*}/tables:restore"
-          + ":\001*\312A\035\n\005Table\022\024RestoreTableMetadata\022\234\001\n\014"
-          + "GetIamPolicy\022\".google.iam.v1.GetIamPolic"
-          + "yRequest\032\025.google.iam.v1.Policy\"Q\202\323\344\223\002@\""
-          + ";/v2/{resource=projects/*/instances/*/ta"
-          + "bles/*}:getIamPolicy:\001*\332A\010resource\022\363\001\n\014S"
-          + "etIamPolicy\022\".google.iam.v1.SetIamPolicy"
-          + "Request\032\025.google.iam.v1.Policy\"\247\001\202\323\344\223\002\216\001"
-          + "\";/v2/{resource=projects/*/instances/*/t"
-          + "ables/*}:setIamPolicy:\001*ZL\"G/v2/{resourc"
-          + "e=projects/*/instances/*/clusters/*/back"
-          + "ups/*}:setIamPolicy:\001*\332A\017resource,policy"
-          + "\022\244\002\n\022TestIamPermissions\022(.google.iam.v1."
-          + "TestIamPermissionsRequest\032).google.iam.v"
-          + "1.TestIamPermissionsResponse\"\270\001\202\323\344\223\002\232\001\"A"
-          + "/v2/{resource=projects/*/instances/*/tab"
-          + "les/*}:testIamPermissions:\001*ZR\"M/v2/{res"
-          + "ource=projects/*/instances/*/clusters/*/"
-          + "backups/*}:testIamPermissions:\001*\332A\024resou"
-          + "rce,permissions\032\336\002\312A\034bigtableadmin.googl"
-          + "eapis.com\322A\273\002https://www.googleapis.com/"
-          + "auth/bigtable.admin,https://www.googleap"
-          + "is.com/auth/bigtable.admin.table,https:/"
-          + "/www.googleapis.com/auth/cloud-bigtable."
-          + "admin,https://www.googleapis.com/auth/cl"
-          + "oud-bigtable.admin.table,https://www.goo"
-          + "gleapis.com/auth/cloud-platform,https://"
-          + "www.googleapis.com/auth/cloud-platform.r"
-          + "ead-onlyB\337\001\n\034com.google.bigtable.admin.v"
-          + "2B\027BigtableTableAdminProtoP\001Z=google.gol"
-          + "ang.org/genproto/googleapis/bigtable/adm"
-          + "in/v2;admin\252\002\036Google.Cloud.Bigtable.Admi"
-          + "n.V2\312\002\036Google\\Cloud\\Bigtable\\Admin\\V2\352\002\""
-          + "Google::Cloud::Bigtable::Admin::V2b\006prot"
-          + "o3"
+          + "e\022\340\001\n\014CreateBackup\022-.google.bigtable.adm"
+          + "in.v2.CreateBackupRequest\032\035.google.longr"
+          + "unning.Operation\"\201\001\202\323\344\223\002@\"6/v2/{parent=p"
+          + "rojects/*/instances/*/clusters/*}/backup"
+          + "s:\006backup\332A\027parent,backup_id,backup\312A\036\n\006"
+          + "Backup\022\024CreateBackupMetadata\022\240\001\n\tGetBack"
+          + "up\022*.google.bigtable.admin.v2.GetBackupR"
+          + "equest\032 .google.bigtable.admin.v2.Backup"
+          + "\"E\202\323\344\223\0028\0226/v2/{name=projects/*/instances"
+          + "/*/clusters/*/backups/*}\332A\004name\022\303\001\n\014Upda"
+          + "teBackup\022-.google.bigtable.admin.v2.Upda"
+          + "teBackupRequest\032 .google.bigtable.admin."
+          + "v2.Backup\"b\202\323\344\223\002G2=/v2/{backup.name=proj"
+          + "ects/*/instances/*/clusters/*/backups/*}"
+          + ":\006backup\332A\022backup,update_mask\022\234\001\n\014Delete"
+          + "Backup\022-.google.bigtable.admin.v2.Delete"
+          + "BackupRequest\032\026.google.protobuf.Empty\"E\202"
+          + "\323\344\223\0028*6/v2/{name=projects/*/instances/*/"
+          + "clusters/*/backups/*}\332A\004name\022\263\001\n\013ListBac"
+          + "kups\022,.google.bigtable.admin.v2.ListBack"
+          + "upsRequest\032-.google.bigtable.admin.v2.Li"
+          + "stBackupsResponse\"G\202\323\344\223\0028\0226/v2/{parent=p"
+          + "rojects/*/instances/*/clusters/*}/backup"
+          + "s\332A\006parent\022\273\001\n\014RestoreTable\022-.google.big"
+          + "table.admin.v2.RestoreTableRequest\032\035.goo"
+          + "gle.longrunning.Operation\"]\202\323\344\223\0027\"2/v2/{"
+          + "parent=projects/*/instances/*}/tables:re"
+          + "store:\001*\312A\035\n\005Table\022\024RestoreTableMetadata"
+          + "\022\354\001\n\014GetIamPolicy\022\".google.iam.v1.GetIam"
+          + "PolicyRequest\032\025.google.iam.v1.Policy\"\240\001\202"
+          + "\323\344\223\002\216\001\";/v2/{resource=projects/*/instanc"
+          + "es/*/tables/*}:getIamPolicy:\001*ZL\"G/v2/{r"
+          + "esource=projects/*/instances/*/clusters/"
+          + "*/backups/*}:getIamPolicy:\001*\332A\010resource\022"
+          + "\363\001\n\014SetIamPolicy\022\".google.iam.v1.SetIamP"
+          + "olicyRequest\032\025.google.iam.v1.Policy\"\247\001\202\323"
+          + "\344\223\002\216\001\";/v2/{resource=projects/*/instance"
+          + "s/*/tables/*}:setIamPolicy:\001*ZL\"G/v2/{re"
+          + "source=projects/*/instances/*/clusters/*"
+          + "/backups/*}:setIamPolicy:\001*\332A\017resource,p"
+          + "olicy\022\244\002\n\022TestIamPermissions\022(.google.ia"
+          + "m.v1.TestIamPermissionsRequest\032).google."
+          + "iam.v1.TestIamPermissionsResponse\"\270\001\202\323\344\223"
+          + "\002\232\001\"A/v2/{resource=projects/*/instances/"
+          + "*/tables/*}:testIamPermissions:\001*ZR\"M/v2"
+          + "/{resource=projects/*/instances/*/cluste"
+          + "rs/*/backups/*}:testIamPermissions:\001*\332A\024"
+          + "resource,permissions\032\336\002\312A\034bigtableadmin."
+          + "googleapis.com\322A\273\002https://www.googleapis"
+          + ".com/auth/bigtable.admin,https://www.goo"
+          + "gleapis.com/auth/bigtable.admin.table,ht"
+          + "tps://www.googleapis.com/auth/cloud-bigt"
+          + "able.admin,https://www.googleapis.com/au"
+          + "th/cloud-bigtable.admin.table,https://ww"
+          + "w.googleapis.com/auth/cloud-platform,htt"
+          + "ps://www.googleapis.com/auth/cloud-platf"
+          + "orm.read-onlyB\337\001\n\034com.google.bigtable.ad"
+          + "min.v2B\027BigtableTableAdminProtoP\001Z=googl"
+          + "e.golang.org/genproto/googleapis/bigtabl"
+          + "e/admin/v2;admin\252\002\036Google.Cloud.Bigtable"
+          + ".Admin.V2\312\002\036Google\\Cloud\\Bigtable\\Admin\\"
+          + "V2\352\002\"Google::Cloud::Bigtable::Admin::V2b"
+          + "\006proto3"
     };
     descriptor =
         com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom(
@@ -417,8 +421,37 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               com.google.protobuf.FieldMaskProto.getDescriptor(),
               com.google.protobuf.TimestampProto.getDescriptor(),
             });
-    internal_static_google_bigtable_admin_v2_CreateTableRequest_descriptor =
+    internal_static_google_bigtable_admin_v2_RestoreTableRequest_descriptor =
         getDescriptor().getMessageTypes().get(0);
+    internal_static_google_bigtable_admin_v2_RestoreTableRequest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_bigtable_admin_v2_RestoreTableRequest_descriptor,
+            new java.lang.String[] {
+              "Parent", "TableId", "Backup", "Source",
+            });
+    internal_static_google_bigtable_admin_v2_RestoreTableMetadata_descriptor =
+        getDescriptor().getMessageTypes().get(1);
+    internal_static_google_bigtable_admin_v2_RestoreTableMetadata_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_bigtable_admin_v2_RestoreTableMetadata_descriptor,
+            new java.lang.String[] {
+              "Name",
+              "SourceType",
+              "BackupInfo",
+              "OptimizeTableOperationName",
+              "Progress",
+              "SourceInfo",
+            });
+    internal_static_google_bigtable_admin_v2_OptimizeRestoredTableMetadata_descriptor =
+        getDescriptor().getMessageTypes().get(2);
+    internal_static_google_bigtable_admin_v2_OptimizeRestoredTableMetadata_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_bigtable_admin_v2_OptimizeRestoredTableMetadata_descriptor,
+            new java.lang.String[] {
+              "Name", "Progress",
+            });
+    internal_static_google_bigtable_admin_v2_CreateTableRequest_descriptor =
+        getDescriptor().getMessageTypes().get(3);
     internal_static_google_bigtable_admin_v2_CreateTableRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_CreateTableRequest_descriptor,
@@ -436,7 +469,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Key",
             });
     internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotRequest_descriptor =
-        getDescriptor().getMessageTypes().get(1);
+        getDescriptor().getMessageTypes().get(4);
     internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotRequest_descriptor,
@@ -444,7 +477,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Parent", "TableId", "SourceSnapshot",
             });
     internal_static_google_bigtable_admin_v2_DropRowRangeRequest_descriptor =
-        getDescriptor().getMessageTypes().get(2);
+        getDescriptor().getMessageTypes().get(5);
     internal_static_google_bigtable_admin_v2_DropRowRangeRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_DropRowRangeRequest_descriptor,
@@ -452,7 +485,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Name", "RowKeyPrefix", "DeleteAllDataFromTable", "Target",
             });
     internal_static_google_bigtable_admin_v2_ListTablesRequest_descriptor =
-        getDescriptor().getMessageTypes().get(3);
+        getDescriptor().getMessageTypes().get(6);
     internal_static_google_bigtable_admin_v2_ListTablesRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_ListTablesRequest_descriptor,
@@ -460,7 +493,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Parent", "View", "PageSize", "PageToken",
             });
     internal_static_google_bigtable_admin_v2_ListTablesResponse_descriptor =
-        getDescriptor().getMessageTypes().get(4);
+        getDescriptor().getMessageTypes().get(7);
     internal_static_google_bigtable_admin_v2_ListTablesResponse_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_ListTablesResponse_descriptor,
@@ -468,7 +501,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Tables", "NextPageToken",
             });
     internal_static_google_bigtable_admin_v2_GetTableRequest_descriptor =
-        getDescriptor().getMessageTypes().get(5);
+        getDescriptor().getMessageTypes().get(8);
     internal_static_google_bigtable_admin_v2_GetTableRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_GetTableRequest_descriptor,
@@ -476,7 +509,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Name", "View",
             });
     internal_static_google_bigtable_admin_v2_DeleteTableRequest_descriptor =
-        getDescriptor().getMessageTypes().get(6);
+        getDescriptor().getMessageTypes().get(9);
     internal_static_google_bigtable_admin_v2_DeleteTableRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_DeleteTableRequest_descriptor,
@@ -484,7 +517,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Name",
             });
     internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_descriptor =
-        getDescriptor().getMessageTypes().get(7);
+        getDescriptor().getMessageTypes().get(10);
     internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_ModifyColumnFamiliesRequest_descriptor,
@@ -502,7 +535,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Id", "Create", "Update", "Drop", "Mod",
             });
     internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenRequest_descriptor =
-        getDescriptor().getMessageTypes().get(8);
+        getDescriptor().getMessageTypes().get(11);
     internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenRequest_descriptor,
@@ -510,7 +543,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Name",
             });
     internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenResponse_descriptor =
-        getDescriptor().getMessageTypes().get(9);
+        getDescriptor().getMessageTypes().get(12);
     internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenResponse_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_GenerateConsistencyTokenResponse_descriptor,
@@ -518,7 +551,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "ConsistencyToken",
             });
     internal_static_google_bigtable_admin_v2_CheckConsistencyRequest_descriptor =
-        getDescriptor().getMessageTypes().get(10);
+        getDescriptor().getMessageTypes().get(13);
     internal_static_google_bigtable_admin_v2_CheckConsistencyRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_CheckConsistencyRequest_descriptor,
@@ -526,7 +559,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Name", "ConsistencyToken",
             });
     internal_static_google_bigtable_admin_v2_CheckConsistencyResponse_descriptor =
-        getDescriptor().getMessageTypes().get(11);
+        getDescriptor().getMessageTypes().get(14);
     internal_static_google_bigtable_admin_v2_CheckConsistencyResponse_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_CheckConsistencyResponse_descriptor,
@@ -534,7 +567,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Consistent",
             });
     internal_static_google_bigtable_admin_v2_SnapshotTableRequest_descriptor =
-        getDescriptor().getMessageTypes().get(12);
+        getDescriptor().getMessageTypes().get(15);
     internal_static_google_bigtable_admin_v2_SnapshotTableRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_SnapshotTableRequest_descriptor,
@@ -542,7 +575,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Name", "Cluster", "SnapshotId", "Ttl", "Description",
             });
     internal_static_google_bigtable_admin_v2_GetSnapshotRequest_descriptor =
-        getDescriptor().getMessageTypes().get(13);
+        getDescriptor().getMessageTypes().get(16);
     internal_static_google_bigtable_admin_v2_GetSnapshotRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_GetSnapshotRequest_descriptor,
@@ -550,7 +583,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Name",
             });
     internal_static_google_bigtable_admin_v2_ListSnapshotsRequest_descriptor =
-        getDescriptor().getMessageTypes().get(14);
+        getDescriptor().getMessageTypes().get(17);
     internal_static_google_bigtable_admin_v2_ListSnapshotsRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_ListSnapshotsRequest_descriptor,
@@ -558,7 +591,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Parent", "PageSize", "PageToken",
             });
     internal_static_google_bigtable_admin_v2_ListSnapshotsResponse_descriptor =
-        getDescriptor().getMessageTypes().get(15);
+        getDescriptor().getMessageTypes().get(18);
     internal_static_google_bigtable_admin_v2_ListSnapshotsResponse_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_ListSnapshotsResponse_descriptor,
@@ -566,7 +599,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Snapshots", "NextPageToken",
             });
     internal_static_google_bigtable_admin_v2_DeleteSnapshotRequest_descriptor =
-        getDescriptor().getMessageTypes().get(16);
+        getDescriptor().getMessageTypes().get(19);
     internal_static_google_bigtable_admin_v2_DeleteSnapshotRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_DeleteSnapshotRequest_descriptor,
@@ -574,7 +607,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Name",
             });
     internal_static_google_bigtable_admin_v2_SnapshotTableMetadata_descriptor =
-        getDescriptor().getMessageTypes().get(17);
+        getDescriptor().getMessageTypes().get(20);
     internal_static_google_bigtable_admin_v2_SnapshotTableMetadata_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_SnapshotTableMetadata_descriptor,
@@ -582,7 +615,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "OriginalRequest", "RequestTime", "FinishTime",
             });
     internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotMetadata_descriptor =
-        getDescriptor().getMessageTypes().get(18);
+        getDescriptor().getMessageTypes().get(21);
     internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotMetadata_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_CreateTableFromSnapshotMetadata_descriptor,
@@ -590,7 +623,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "OriginalRequest", "RequestTime", "FinishTime",
             });
     internal_static_google_bigtable_admin_v2_CreateBackupRequest_descriptor =
-        getDescriptor().getMessageTypes().get(19);
+        getDescriptor().getMessageTypes().get(22);
     internal_static_google_bigtable_admin_v2_CreateBackupRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_CreateBackupRequest_descriptor,
@@ -598,31 +631,31 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Parent", "BackupId", "Backup",
             });
     internal_static_google_bigtable_admin_v2_CreateBackupMetadata_descriptor =
-        getDescriptor().getMessageTypes().get(20);
+        getDescriptor().getMessageTypes().get(23);
     internal_static_google_bigtable_admin_v2_CreateBackupMetadata_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_CreateBackupMetadata_descriptor,
             new java.lang.String[] {
               "Name", "SourceTable", "StartTime", "EndTime",
             });
-    internal_static_google_bigtable_admin_v2_GetBackupRequest_descriptor =
-        getDescriptor().getMessageTypes().get(21);
-    internal_static_google_bigtable_admin_v2_GetBackupRequest_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_google_bigtable_admin_v2_GetBackupRequest_descriptor,
-            new java.lang.String[] {
-              "Name",
-            });
     internal_static_google_bigtable_admin_v2_UpdateBackupRequest_descriptor =
-        getDescriptor().getMessageTypes().get(22);
+        getDescriptor().getMessageTypes().get(24);
     internal_static_google_bigtable_admin_v2_UpdateBackupRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_UpdateBackupRequest_descriptor,
             new java.lang.String[] {
               "Backup", "UpdateMask",
             });
+    internal_static_google_bigtable_admin_v2_GetBackupRequest_descriptor =
+        getDescriptor().getMessageTypes().get(25);
+    internal_static_google_bigtable_admin_v2_GetBackupRequest_fieldAccessorTable =
+        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+            internal_static_google_bigtable_admin_v2_GetBackupRequest_descriptor,
+            new java.lang.String[] {
+              "Name",
+            });
     internal_static_google_bigtable_admin_v2_DeleteBackupRequest_descriptor =
-        getDescriptor().getMessageTypes().get(23);
+        getDescriptor().getMessageTypes().get(26);
     internal_static_google_bigtable_admin_v2_DeleteBackupRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_DeleteBackupRequest_descriptor,
@@ -630,7 +663,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Name",
             });
     internal_static_google_bigtable_admin_v2_ListBackupsRequest_descriptor =
-        getDescriptor().getMessageTypes().get(24);
+        getDescriptor().getMessageTypes().get(27);
     internal_static_google_bigtable_admin_v2_ListBackupsRequest_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_ListBackupsRequest_descriptor,
@@ -638,42 +671,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
               "Parent", "Filter", "OrderBy", "PageSize", "PageToken",
             });
     internal_static_google_bigtable_admin_v2_ListBackupsResponse_descriptor =
-        getDescriptor().getMessageTypes().get(25);
+        getDescriptor().getMessageTypes().get(28);
     internal_static_google_bigtable_admin_v2_ListBackupsResponse_fieldAccessorTable =
         new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
             internal_static_google_bigtable_admin_v2_ListBackupsResponse_descriptor,
             new java.lang.String[] {
               "Backups", "NextPageToken",
             });
-    internal_static_google_bigtable_admin_v2_RestoreTableRequest_descriptor =
-        getDescriptor().getMessageTypes().get(26);
-    internal_static_google_bigtable_admin_v2_RestoreTableRequest_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_google_bigtable_admin_v2_RestoreTableRequest_descriptor,
-            new java.lang.String[] {
-              "Parent", "TableId", "Backup", "Source",
-            });
-    internal_static_google_bigtable_admin_v2_RestoreTableMetadata_descriptor =
-        getDescriptor().getMessageTypes().get(27);
-    internal_static_google_bigtable_admin_v2_RestoreTableMetadata_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_google_bigtable_admin_v2_RestoreTableMetadata_descriptor,
-            new java.lang.String[] {
-              "Name",
-              "SourceType",
-              "BackupInfo",
-              "OptimizeTableOperationName",
-              "Progress",
-              "SourceInfo",
-            });
-    internal_static_google_bigtable_admin_v2_OptimizeRestoredTableMetadata_descriptor =
-        getDescriptor().getMessageTypes().get(28);
-    internal_static_google_bigtable_admin_v2_OptimizeRestoredTableMetadata_fieldAccessorTable =
-        new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
-            internal_static_google_bigtable_admin_v2_OptimizeRestoredTableMetadata_descriptor,
-            new java.lang.String[] {
-              "Name", "Progress",
-            });
     com.google.protobuf.ExtensionRegistry registry =
         com.google.protobuf.ExtensionRegistry.newInstance();
     registry.add(com.google.api.ClientProto.defaultHost);
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
index 6213654bb3..a470430641 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java
@@ -126,8 +126,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * 
-   * Required. The unique name of the Table for which to check replication
-   * consistency. Values are of the form
+   * Required. The unique name of the Table for which to check replication consistency.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/tables/{table}`.
    * 

    *
@@ -153,8 +153,8 @@ public java.lang.String getName() {
    *
    *
    * 
-   * Required. The unique name of the Table for which to check replication
-   * consistency. Values are of the form
+   * Required. The unique name of the Table for which to check replication consistency.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/tables/{table}`.
    * 

    *
@@ -566,8 +566,8 @@ public Builder mergeFrom(
      *
      *
      * 
-     * Required. The unique name of the Table for which to check replication
-     * consistency. Values are of the form
+     * Required. The unique name of the Table for which to check replication consistency.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/tables/{table}`.
      * 

      *
@@ -592,8 +592,8 @@ public java.lang.String getName() {
      *
      *
      * 
-     * Required. The unique name of the Table for which to check replication
-     * consistency. Values are of the form
+     * Required. The unique name of the Table for which to check replication consistency.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/tables/{table}`.
      * 

      *
@@ -618,8 +618,8 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      *
      * 
-     * Required. The unique name of the Table for which to check replication
-     * consistency. Values are of the form
+     * Required. The unique name of the Table for which to check replication consistency.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/tables/{table}`.
      * 

      *
@@ -643,8 +643,8 @@ public Builder setName(java.lang.String value) {
      *
      *
      * 
-     * Required. The unique name of the Table for which to check replication
-     * consistency. Values are of the form
+     * Required. The unique name of the Table for which to check replication consistency.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/tables/{table}`.
      * 

      *
@@ -664,8 +664,8 @@ public Builder clearName() {
      *
      *
      * 
-     * Required. The unique name of the Table for which to check replication
-     * consistency. Values are of the form
+     * Required. The unique name of the Table for which to check replication consistency.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/tables/{table}`.
      * 

      *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequestOrBuilder.java
index 1835ce76cc..b6accf6535 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequestOrBuilder.java
@@ -27,8 +27,8 @@ public interface CheckConsistencyRequestOrBuilder
    *
    *
    * 
-   * Required. The unique name of the Table for which to check replication
-   * consistency. Values are of the form
+   * Required. The unique name of the Table for which to check replication consistency.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/tables/{table}`.
    * 

    *
@@ -43,8 +43,8 @@ public interface CheckConsistencyRequestOrBuilder
    *
    *
    * 
-   * Required. The unique name of the Table for which to check replication
-   * consistency. Values are of the form
+   * Required. The unique name of the Table for which to check replication consistency.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/tables/{table}`.
    * 

    *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupRequest.java
index be73313831..708a5ba1ba 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateBackupRequest.java
@@ -22,8 +22,7 @@
  *
  *
  * 
- * The request for
- * [CreateBackup][google.bigtable.admin.v2.BigtableTableAdmin.CreateBackup].
+ * The request for [CreateBackup][google.bigtable.admin.v2.BigtableTableAdmin.CreateBackup].
  * 

  *
  * Protobuf type {@code google.bigtable.admin.v2.CreateBackupRequest}
@@ -487,8 +486,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for
-   * [CreateBackup][google.bigtable.admin.v2.BigtableTableAdmin.CreateBackup].
+   * The request for [CreateBackup][google.bigtable.admin.v2.BigtableTableAdmin.CreateBackup].
    * 

    *
    * Protobuf type {@code google.bigtable.admin.v2.CreateBackupRequest}
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
index e2584ac05b..0db14a052a 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequest.java
@@ -194,8 +194,8 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    *
    * 
-   * Required. The name by which the new table should be referred to within the
-   * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+   * Required. The name by which the new table should be referred to within the parent
+   * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
    * 

    *
    * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
@@ -218,8 +218,8 @@ public java.lang.String getTableId() {
    *
    *
    * 
-   * Required. The name by which the new table should be referred to within the
-   * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+   * Required. The name by which the new table should be referred to within the parent
+   * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
    * 

    *
    * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
@@ -245,9 +245,9 @@ public com.google.protobuf.ByteString getTableIdBytes() {
    *
    *
    * 
-   * Required. The unique name of the snapshot from which to restore the table.
-   * The snapshot and the table must be in the same instance. Values are of the
-   * form
+   * Required. The unique name of the snapshot from which to restore the table. The
+   * snapshot and the table must be in the same instance.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/{snapshot}`.
    * 

    *
@@ -273,9 +273,9 @@ public java.lang.String getSourceSnapshot() {
    *
    *
    * 
-   * Required. The unique name of the snapshot from which to restore the table.
-   * The snapshot and the table must be in the same instance. Values are of the
-   * form
+   * Required. The unique name of the snapshot from which to restore the table. The
+   * snapshot and the table must be in the same instance.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/{snapshot}`.
    * 

    *
@@ -780,8 +780,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      *
      * 
-     * Required. The name by which the new table should be referred to within the
-     * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+     * Required. The name by which the new table should be referred to within the parent
+     * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
      * 

      *
      * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
@@ -803,8 +803,8 @@ public java.lang.String getTableId() {
      *
      *
      * 
-     * Required. The name by which the new table should be referred to within the
-     * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+     * Required. The name by which the new table should be referred to within the parent
+     * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
      * 

      *
      * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
@@ -826,8 +826,8 @@ public com.google.protobuf.ByteString getTableIdBytes() {
      *
      *
      * 
-     * Required. The name by which the new table should be referred to within the
-     * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+     * Required. The name by which the new table should be referred to within the parent
+     * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
      * 

      *
      * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
@@ -848,8 +848,8 @@ public Builder setTableId(java.lang.String value) {
      *
      *
      * 
-     * Required. The name by which the new table should be referred to within the
-     * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+     * Required. The name by which the new table should be referred to within the parent
+     * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
      * 

      *
      * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
@@ -866,8 +866,8 @@ public Builder clearTableId() {
      *
      *
      * 
-     * Required. The name by which the new table should be referred to within the
-     * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+     * Required. The name by which the new table should be referred to within the parent
+     * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
      * 

      *
      * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
@@ -891,9 +891,9 @@ public Builder setTableIdBytes(com.google.protobuf.ByteString value) {
      *
      *
      * 
-     * Required. The unique name of the snapshot from which to restore the table.
-     * The snapshot and the table must be in the same instance. Values are of the
-     * form
+     * Required. The unique name of the snapshot from which to restore the table. The
+     * snapshot and the table must be in the same instance.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/{snapshot}`.
      * 

      *
@@ -918,9 +918,9 @@ public java.lang.String getSourceSnapshot() {
      *
      *
      * 
-     * Required. The unique name of the snapshot from which to restore the table.
-     * The snapshot and the table must be in the same instance. Values are of the
-     * form
+     * Required. The unique name of the snapshot from which to restore the table. The
+     * snapshot and the table must be in the same instance.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/{snapshot}`.
      * 

      *
@@ -945,9 +945,9 @@ public com.google.protobuf.ByteString getSourceSnapshotBytes() {
      *
      *
      * 
-     * Required. The unique name of the snapshot from which to restore the table.
-     * The snapshot and the table must be in the same instance. Values are of the
-     * form
+     * Required. The unique name of the snapshot from which to restore the table. The
+     * snapshot and the table must be in the same instance.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/{snapshot}`.
      * 

      *
@@ -971,9 +971,9 @@ public Builder setSourceSnapshot(java.lang.String value) {
      *
      *
      * 
-     * Required. The unique name of the snapshot from which to restore the table.
-     * The snapshot and the table must be in the same instance. Values are of the
-     * form
+     * Required. The unique name of the snapshot from which to restore the table. The
+     * snapshot and the table must be in the same instance.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/{snapshot}`.
      * 

      *
@@ -993,9 +993,9 @@ public Builder clearSourceSnapshot() {
      *
      *
      * 
-     * Required. The unique name of the snapshot from which to restore the table.
-     * The snapshot and the table must be in the same instance. Values are of the
-     * form
+     * Required. The unique name of the snapshot from which to restore the table. The
+     * snapshot and the table must be in the same instance.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/{snapshot}`.
      * 

      *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequestOrBuilder.java
index 00929660e3..f3a5b86e8f 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableFromSnapshotRequestOrBuilder.java
@@ -58,8 +58,8 @@ public interface CreateTableFromSnapshotRequestOrBuilder
    *
    *
    * 
-   * Required. The name by which the new table should be referred to within the
-   * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+   * Required. The name by which the new table should be referred to within the parent
+   * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
    * 

    *
    * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
@@ -71,8 +71,8 @@ public interface CreateTableFromSnapshotRequestOrBuilder
    *
    *
    * 
-   * Required. The name by which the new table should be referred to within the
-   * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+   * Required. The name by which the new table should be referred to within the parent
+   * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
    * 

    *
    * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
@@ -85,9 +85,9 @@ public interface CreateTableFromSnapshotRequestOrBuilder
    *
    *
    * 
-   * Required. The unique name of the snapshot from which to restore the table.
-   * The snapshot and the table must be in the same instance. Values are of the
-   * form
+   * Required. The unique name of the snapshot from which to restore the table. The
+   * snapshot and the table must be in the same instance.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/{snapshot}`.
    * 

    *
@@ -102,9 +102,9 @@ public interface CreateTableFromSnapshotRequestOrBuilder
    *
    *
    * 
-   * Required. The unique name of the snapshot from which to restore the table.
-   * The snapshot and the table must be in the same instance. Values are of the
-   * form
+   * Required. The unique name of the snapshot from which to restore the table. The
+   * snapshot and the table must be in the same instance.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/{snapshot}`.
    * 

    *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java
index aecbaf6b89..644b5c35b1 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequest.java
@@ -771,8 +771,8 @@ public com.google.protobuf.ByteString getParentBytes() {
    *
    *
    * 
-   * Required. The name by which the new table should be referred to within the
-   * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+   * Required. The name by which the new table should be referred to within the parent
+   * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
    * Maximum 50 characters.
    * 

    *
@@ -796,8 +796,8 @@ public java.lang.String getTableId() {
    *
    *
    * 
-   * Required. The name by which the new table should be referred to within the
-   * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+   * Required. The name by which the new table should be referred to within the parent
+   * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
    * Maximum 50 characters.
    * 

    *
@@ -1549,8 +1549,8 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      *
      *
      * 
-     * Required. The name by which the new table should be referred to within the
-     * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+     * Required. The name by which the new table should be referred to within the parent
+     * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
      * Maximum 50 characters.
      * 

      *
@@ -1573,8 +1573,8 @@ public java.lang.String getTableId() {
      *
      *
      * 
-     * Required. The name by which the new table should be referred to within the
-     * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+     * Required. The name by which the new table should be referred to within the parent
+     * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
      * Maximum 50 characters.
      * 

      *
@@ -1597,8 +1597,8 @@ public com.google.protobuf.ByteString getTableIdBytes() {
      *
      *
      * 
-     * Required. The name by which the new table should be referred to within the
-     * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+     * Required. The name by which the new table should be referred to within the parent
+     * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
      * Maximum 50 characters.
      * 

      *
@@ -1620,8 +1620,8 @@ public Builder setTableId(java.lang.String value) {
      *
      *
      * 
-     * Required. The name by which the new table should be referred to within the
-     * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+     * Required. The name by which the new table should be referred to within the parent
+     * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
      * Maximum 50 characters.
      * 

      *
@@ -1639,8 +1639,8 @@ public Builder clearTableId() {
      *
      *
      * 
-     * Required. The name by which the new table should be referred to within the
-     * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+     * Required. The name by which the new table should be referred to within the parent
+     * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
      * Maximum 50 characters.
      * 

      *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequestOrBuilder.java
index ace5057226..c456476e3f 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateTableRequestOrBuilder.java
@@ -58,8 +58,8 @@ public interface CreateTableRequestOrBuilder
    *
    *
    * 
-   * Required. The name by which the new table should be referred to within the
-   * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+   * Required. The name by which the new table should be referred to within the parent
+   * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
    * Maximum 50 characters.
    * 

    *
@@ -72,8 +72,8 @@ public interface CreateTableRequestOrBuilder
    *
    *
    * 
-   * Required. The name by which the new table should be referred to within the
-   * parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+   * Required. The name by which the new table should be referred to within the parent
+   * instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
    * Maximum 50 characters.
    * 

    *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
index 52dda72187..d4b0e4e310 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java
@@ -177,10 +177,10 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    *
    * 
-   * If true, ignore safety checks when deleting the app profile.
+   * Required. If true, ignore safety checks when deleting the app profile.
    * 

    *
-   * bool ignore_warnings = 2;
+   * bool ignore_warnings = 2 [(.google.api.field_behavior) = REQUIRED];
    *
    * @return The ignoreWarnings.
    */
@@ -648,10 +648,10 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) {
      *
      *
      * 
-     * If true, ignore safety checks when deleting the app profile.
+     * Required. If true, ignore safety checks when deleting the app profile.
      * 

      *
-     * bool ignore_warnings = 2;
+     * bool ignore_warnings = 2 [(.google.api.field_behavior) = REQUIRED];
      *
      * @return The ignoreWarnings.
      */
@@ -663,10 +663,10 @@ public boolean getIgnoreWarnings() {
      *
      *
      * 
-     * If true, ignore safety checks when deleting the app profile.
+     * Required. If true, ignore safety checks when deleting the app profile.
      * 

      *
-     * bool ignore_warnings = 2;
+     * bool ignore_warnings = 2 [(.google.api.field_behavior) = REQUIRED];
      *
      * @param value The ignoreWarnings to set.
      * @return This builder for chaining.
@@ -681,10 +681,10 @@ public Builder setIgnoreWarnings(boolean value) {
      *
      *
      * 
-     * If true, ignore safety checks when deleting the app profile.
+     * Required. If true, ignore safety checks when deleting the app profile.
      * 

      *
-     * bool ignore_warnings = 2;
+     * bool ignore_warnings = 2 [(.google.api.field_behavior) = REQUIRED];
      *
      * @return This builder for chaining.
      */
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequestOrBuilder.java
index 6749ba3c22..f62608712c 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequestOrBuilder.java
@@ -58,10 +58,10 @@ public interface DeleteAppProfileRequestOrBuilder
    *
    *
    * 
-   * If true, ignore safety checks when deleting the app profile.
+   * Required. If true, ignore safety checks when deleting the app profile.
    * 

    *
-   * bool ignore_warnings = 2;
+   * bool ignore_warnings = 2 [(.google.api.field_behavior) = REQUIRED];
    *
    * @return The ignoreWarnings.
    */
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteBackupRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteBackupRequest.java
index 19ba1bcfb7..bf0a30d5cc 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteBackupRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteBackupRequest.java
@@ -22,8 +22,7 @@
  *
  *
  * 
- * The request for
- * [DeleteBackup][google.bigtable.admin.v2.BigtableTableAdmin.DeleteBackup].
+ * The request for [DeleteBackup][google.bigtable.admin.v2.BigtableTableAdmin.DeleteBackup].
  * 

  *
  * Protobuf type {@code google.bigtable.admin.v2.DeleteBackupRequest}
@@ -332,8 +331,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for
-   * [DeleteBackup][google.bigtable.admin.v2.BigtableTableAdmin.DeleteBackup].
+   * The request for [DeleteBackup][google.bigtable.admin.v2.BigtableTableAdmin.DeleteBackup].
    * 

    *
    * Protobuf type {@code google.bigtable.admin.v2.DeleteBackupRequest}
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
index 280a6cc913..db2547bf0c 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java
@@ -119,8 +119,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * 
-   * Required. The unique name of the Table for which to create a consistency
-   * token. Values are of the form
+   * Required. The unique name of the Table for which to create a consistency token.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/tables/{table}`.
    * 

    *
@@ -146,8 +146,8 @@ public java.lang.String getName() {
    *
    *
    * 
-   * Required. The unique name of the Table for which to create a consistency
-   * token. Values are of the form
+   * Required. The unique name of the Table for which to create a consistency token.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/tables/{table}`.
    * 

    *
@@ -497,8 +497,8 @@ public Builder mergeFrom(
      *
      *
      * 
-     * Required. The unique name of the Table for which to create a consistency
-     * token. Values are of the form
+     * Required. The unique name of the Table for which to create a consistency token.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/tables/{table}`.
      * 

      *
@@ -523,8 +523,8 @@ public java.lang.String getName() {
      *
      *
      * 
-     * Required. The unique name of the Table for which to create a consistency
-     * token. Values are of the form
+     * Required. The unique name of the Table for which to create a consistency token.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/tables/{table}`.
      * 

      *
@@ -549,8 +549,8 @@ public com.google.protobuf.ByteString getNameBytes() {
      *
      *
      * 
-     * Required. The unique name of the Table for which to create a consistency
-     * token. Values are of the form
+     * Required. The unique name of the Table for which to create a consistency token.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/tables/{table}`.
      * 

      *
@@ -574,8 +574,8 @@ public Builder setName(java.lang.String value) {
      *
      *
      * 
-     * Required. The unique name of the Table for which to create a consistency
-     * token. Values are of the form
+     * Required. The unique name of the Table for which to create a consistency token.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/tables/{table}`.
      * 

      *
@@ -595,8 +595,8 @@ public Builder clearName() {
      *
      *
      * 
-     * Required. The unique name of the Table for which to create a consistency
-     * token. Values are of the form
+     * Required. The unique name of the Table for which to create a consistency token.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/tables/{table}`.
      * 

      *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequestOrBuilder.java
index fbfb6691fc..9d70e81ddb 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequestOrBuilder.java
@@ -27,8 +27,8 @@ public interface GenerateConsistencyTokenRequestOrBuilder
    *
    *
    * 
-   * Required. The unique name of the Table for which to create a consistency
-   * token. Values are of the form
+   * Required. The unique name of the Table for which to create a consistency token.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/tables/{table}`.
    * 

    *
@@ -43,8 +43,8 @@ public interface GenerateConsistencyTokenRequestOrBuilder
    *
    *
    * 
-   * Required. The unique name of the Table for which to create a consistency
-   * token. Values are of the form
+   * Required. The unique name of the Table for which to create a consistency token.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/tables/{table}`.
    * 

    *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetBackupRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetBackupRequest.java
index 37ef8e0ab4..39bf377a22 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetBackupRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetBackupRequest.java
@@ -22,8 +22,7 @@
  *
  *
  * 
- * The request for
- * [GetBackup][google.bigtable.admin.v2.BigtableTableAdmin.GetBackup].
+ * The request for [GetBackup][google.bigtable.admin.v2.BigtableTableAdmin.GetBackup].
  * 

  *
  * Protobuf type {@code google.bigtable.admin.v2.GetBackupRequest}
@@ -332,8 +331,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for
-   * [GetBackup][google.bigtable.admin.v2.BigtableTableAdmin.GetBackup].
+   * The request for [GetBackup][google.bigtable.admin.v2.BigtableTableAdmin.GetBackup].
    * 

    *
    * Protobuf type {@code google.bigtable.admin.v2.GetBackupRequest}
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequest.java
index e084577f35..8b46d73189 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequest.java
@@ -22,8 +22,7 @@
  *
  *
  * 
- * The request for
- * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
+ * The request for [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
  * 

  *
  * Protobuf type {@code google.bigtable.admin.v2.ListBackupsRequest}
@@ -147,7 +146,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * 
-   * Required. The cluster to list backups from. Values are of the
+   * Required. The cluster to list backups from.  Values are of the
    * form `projects/{project}/instances/{instance}/clusters/{cluster}`.
    * Use `{cluster} = '-'` to list backups for all clusters in an instance,
    * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -175,7 +174,7 @@ public java.lang.String getParent() {
    *
    *
    * 
-   * Required. The cluster to list backups from. Values are of the
+   * Required. The cluster to list backups from.  Values are of the
    * form `projects/{project}/instances/{instance}/clusters/{cluster}`.
    * Use `{cluster} = '-'` to list backups for all clusters in an instance,
    * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -210,7 +209,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    * The expression must specify the field name, a comparison operator,
    * and the value that you want to use for filtering. The value must be a
    * string, a number, or a boolean. The comparison operator must be
-   * <, >, <=, >=, !=, =, or :. Colon ‘:’ represents a HAS operator which is
+   * <, >, <=, >=, !=, =, or :. Colon ':' represents a HAS operator which is
    * roughly synonymous with equality. Filter rules are case insensitive.
    * The fields eligible for filtering are:
    *   * `name`
@@ -260,7 +259,7 @@ public java.lang.String getFilter() {
    * The expression must specify the field name, a comparison operator,
    * and the value that you want to use for filtering. The value must be a
    * string, a number, or a boolean. The comparison operator must be
-   * <, >, <=, >=, !=, =, or :. Colon ‘:’ represents a HAS operator which is
+   * <, >, <=, >=, !=, =, or :. Colon ':' represents a HAS operator which is
    * roughly synonymous with equality. Filter rules are case insensitive.
    * The fields eligible for filtering are:
    *   * `name`
@@ -310,9 +309,8 @@ public com.google.protobuf.ByteString getFilterBytes() {
    *
    * 
    * An expression for specifying the sort order of the results of the request.
-   * The string value should specify one or more fields in
-   * [Backup][google.bigtable.admin.v2.Backup]. The full syntax is described at
-   * https://aip.dev/132#ordering.
+   * The string value should specify one or more fields in [Backup][google.bigtable.admin.v2.Backup]. The full
+   * syntax is described at https://aip.dev/132#ordering.
    * Fields supported are:
    *    * name
    *    * source_table
@@ -350,9 +348,8 @@ public java.lang.String getOrderBy() {
    *
    * 
    * An expression for specifying the sort order of the results of the request.
-   * The string value should specify one or more fields in
-   * [Backup][google.bigtable.admin.v2.Backup]. The full syntax is described at
-   * https://aip.dev/132#ordering.
+   * The string value should specify one or more fields in [Backup][google.bigtable.admin.v2.Backup]. The full
+   * syntax is described at https://aip.dev/132#ordering.
    * Fields supported are:
    *    * name
    *    * source_table
@@ -412,10 +409,9 @@ public int getPageSize() {
    *
    * 
    * If non-empty, `page_token` should contain a
-   * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token]
-   * from a previous
-   * [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the
-   * same `parent` and with the same `filter`.
+   * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token] from a
+   * previous [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the same `parent` and with the same
+   * `filter`.
    * 

    *
    * string page_token = 5;
@@ -439,10 +435,9 @@ public java.lang.String getPageToken() {
    *
    * 
    * If non-empty, `page_token` should contain a
-   * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token]
-   * from a previous
-   * [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the
-   * same `parent` and with the same `filter`.
+   * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token] from a
+   * previous [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the same `parent` and with the same
+   * `filter`.
    * 

    *
    * string page_token = 5;
@@ -661,8 +656,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for
-   * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
+   * The request for [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
    * 

    *
    * Protobuf type {@code google.bigtable.admin.v2.ListBackupsRequest}
@@ -848,7 +842,7 @@ public Builder mergeFrom(
      *
      *
      * 
-     * Required. The cluster to list backups from. Values are of the
+     * Required. The cluster to list backups from.  Values are of the
      * form `projects/{project}/instances/{instance}/clusters/{cluster}`.
      * Use `{cluster} = '-'` to list backups for all clusters in an instance,
      * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -875,7 +869,7 @@ public java.lang.String getParent() {
      *
      *
      * 
-     * Required. The cluster to list backups from. Values are of the
+     * Required. The cluster to list backups from.  Values are of the
      * form `projects/{project}/instances/{instance}/clusters/{cluster}`.
      * Use `{cluster} = '-'` to list backups for all clusters in an instance,
      * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -902,7 +896,7 @@ public com.google.protobuf.ByteString getParentBytes() {
      *
      *
      * 
-     * Required. The cluster to list backups from. Values are of the
+     * Required. The cluster to list backups from.  Values are of the
      * form `projects/{project}/instances/{instance}/clusters/{cluster}`.
      * Use `{cluster} = '-'` to list backups for all clusters in an instance,
      * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -928,7 +922,7 @@ public Builder setParent(java.lang.String value) {
      *
      *
      * 
-     * Required. The cluster to list backups from. Values are of the
+     * Required. The cluster to list backups from.  Values are of the
      * form `projects/{project}/instances/{instance}/clusters/{cluster}`.
      * Use `{cluster} = '-'` to list backups for all clusters in an instance,
      * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -950,7 +944,7 @@ public Builder clearParent() {
      *
      *
      * 
-     * Required. The cluster to list backups from. Values are of the
+     * Required. The cluster to list backups from.  Values are of the
      * form `projects/{project}/instances/{instance}/clusters/{cluster}`.
      * Use `{cluster} = '-'` to list backups for all clusters in an instance,
      * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -983,7 +977,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * The expression must specify the field name, a comparison operator,
      * and the value that you want to use for filtering. The value must be a
      * string, a number, or a boolean. The comparison operator must be
-     * <, >, <=, >=, !=, =, or :. Colon ‘:’ represents a HAS operator which is
+     * <, >, <=, >=, !=, =, or :. Colon ':' represents a HAS operator which is
      * roughly synonymous with equality. Filter rules are case insensitive.
      * The fields eligible for filtering are:
      *   * `name`
@@ -1032,7 +1026,7 @@ public java.lang.String getFilter() {
      * The expression must specify the field name, a comparison operator,
      * and the value that you want to use for filtering. The value must be a
      * string, a number, or a boolean. The comparison operator must be
-     * <, >, <=, >=, !=, =, or :. Colon ‘:’ represents a HAS operator which is
+     * <, >, <=, >=, !=, =, or :. Colon ':' represents a HAS operator which is
      * roughly synonymous with equality. Filter rules are case insensitive.
      * The fields eligible for filtering are:
      *   * `name`
@@ -1081,7 +1075,7 @@ public com.google.protobuf.ByteString getFilterBytes() {
      * The expression must specify the field name, a comparison operator,
      * and the value that you want to use for filtering. The value must be a
      * string, a number, or a boolean. The comparison operator must be
-     * <, >, <=, >=, !=, =, or :. Colon ‘:’ represents a HAS operator which is
+     * <, >, <=, >=, !=, =, or :. Colon ':' represents a HAS operator which is
      * roughly synonymous with equality. Filter rules are case insensitive.
      * The fields eligible for filtering are:
      *   * `name`
@@ -1129,7 +1123,7 @@ public Builder setFilter(java.lang.String value) {
      * The expression must specify the field name, a comparison operator,
      * and the value that you want to use for filtering. The value must be a
      * string, a number, or a boolean. The comparison operator must be
-     * <, >, <=, >=, !=, =, or :. Colon ‘:’ represents a HAS operator which is
+     * <, >, <=, >=, !=, =, or :. Colon ':' represents a HAS operator which is
      * roughly synonymous with equality. Filter rules are case insensitive.
      * The fields eligible for filtering are:
      *   * `name`
@@ -1173,7 +1167,7 @@ public Builder clearFilter() {
      * The expression must specify the field name, a comparison operator,
      * and the value that you want to use for filtering. The value must be a
      * string, a number, or a boolean. The comparison operator must be
-     * <, >, <=, >=, !=, =, or :. Colon ‘:’ represents a HAS operator which is
+     * <, >, <=, >=, !=, =, or :. Colon ':' represents a HAS operator which is
      * roughly synonymous with equality. Filter rules are case insensitive.
      * The fields eligible for filtering are:
      *   * `name`
@@ -1221,9 +1215,8 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) {
      *
      * 
      * An expression for specifying the sort order of the results of the request.
-     * The string value should specify one or more fields in
-     * [Backup][google.bigtable.admin.v2.Backup]. The full syntax is described at
-     * https://aip.dev/132#ordering.
+     * The string value should specify one or more fields in [Backup][google.bigtable.admin.v2.Backup]. The full
+     * syntax is described at https://aip.dev/132#ordering.
      * Fields supported are:
      *    * name
      *    * source_table
@@ -1260,9 +1253,8 @@ public java.lang.String getOrderBy() {
      *
      * 
      * An expression for specifying the sort order of the results of the request.
-     * The string value should specify one or more fields in
-     * [Backup][google.bigtable.admin.v2.Backup]. The full syntax is described at
-     * https://aip.dev/132#ordering.
+     * The string value should specify one or more fields in [Backup][google.bigtable.admin.v2.Backup]. The full
+     * syntax is described at https://aip.dev/132#ordering.
      * Fields supported are:
      *    * name
      *    * source_table
@@ -1299,9 +1291,8 @@ public com.google.protobuf.ByteString getOrderByBytes() {
      *
      * 
      * An expression for specifying the sort order of the results of the request.
-     * The string value should specify one or more fields in
-     * [Backup][google.bigtable.admin.v2.Backup]. The full syntax is described at
-     * https://aip.dev/132#ordering.
+     * The string value should specify one or more fields in [Backup][google.bigtable.admin.v2.Backup]. The full
+     * syntax is described at https://aip.dev/132#ordering.
      * Fields supported are:
      *    * name
      *    * source_table
@@ -1337,9 +1328,8 @@ public Builder setOrderBy(java.lang.String value) {
      *
      * 
      * An expression for specifying the sort order of the results of the request.
-     * The string value should specify one or more fields in
-     * [Backup][google.bigtable.admin.v2.Backup]. The full syntax is described at
-     * https://aip.dev/132#ordering.
+     * The string value should specify one or more fields in [Backup][google.bigtable.admin.v2.Backup]. The full
+     * syntax is described at https://aip.dev/132#ordering.
      * Fields supported are:
      *    * name
      *    * source_table
@@ -1371,9 +1361,8 @@ public Builder clearOrderBy() {
      *
      * 
      * An expression for specifying the sort order of the results of the request.
-     * The string value should specify one or more fields in
-     * [Backup][google.bigtable.admin.v2.Backup]. The full syntax is described at
-     * https://aip.dev/132#ordering.
+     * The string value should specify one or more fields in [Backup][google.bigtable.admin.v2.Backup]. The full
+     * syntax is described at https://aip.dev/132#ordering.
      * Fields supported are:
      *    * name
      *    * source_table
@@ -1467,10 +1456,9 @@ public Builder clearPageSize() {
      *
      * 
      * If non-empty, `page_token` should contain a
-     * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token]
-     * from a previous
-     * [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the
-     * same `parent` and with the same `filter`.
+     * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token] from a
+     * previous [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the same `parent` and with the same
+     * `filter`.
      * 

      *
      * string page_token = 5;
@@ -1493,10 +1481,9 @@ public java.lang.String getPageToken() {
      *
      * 
      * If non-empty, `page_token` should contain a
-     * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token]
-     * from a previous
-     * [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the
-     * same `parent` and with the same `filter`.
+     * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token] from a
+     * previous [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the same `parent` and with the same
+     * `filter`.
      * 

      *
      * string page_token = 5;
@@ -1519,10 +1506,9 @@ public com.google.protobuf.ByteString getPageTokenBytes() {
      *
      * 
      * If non-empty, `page_token` should contain a
-     * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token]
-     * from a previous
-     * [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the
-     * same `parent` and with the same `filter`.
+     * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token] from a
+     * previous [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the same `parent` and with the same
+     * `filter`.
      * 

      *
      * string page_token = 5;
@@ -1544,10 +1530,9 @@ public Builder setPageToken(java.lang.String value) {
      *
      * 
      * If non-empty, `page_token` should contain a
-     * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token]
-     * from a previous
-     * [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the
-     * same `parent` and with the same `filter`.
+     * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token] from a
+     * previous [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the same `parent` and with the same
+     * `filter`.
      * 

      *
      * string page_token = 5;
@@ -1565,10 +1550,9 @@ public Builder clearPageToken() {
      *
      * 
      * If non-empty, `page_token` should contain a
-     * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token]
-     * from a previous
-     * [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the
-     * same `parent` and with the same `filter`.
+     * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token] from a
+     * previous [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the same `parent` and with the same
+     * `filter`.
      * 

      *
      * string page_token = 5;
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequestOrBuilder.java
index f97eb40cf5..c581ddaefb 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsRequestOrBuilder.java
@@ -27,7 +27,7 @@ public interface ListBackupsRequestOrBuilder
    *
    *
    * 
-   * Required. The cluster to list backups from. Values are of the
+   * Required. The cluster to list backups from.  Values are of the
    * form `projects/{project}/instances/{instance}/clusters/{cluster}`.
    * Use `{cluster} = '-'` to list backups for all clusters in an instance,
    * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -44,7 +44,7 @@ public interface ListBackupsRequestOrBuilder
    *
    *
    * 
-   * Required. The cluster to list backups from. Values are of the
+   * Required. The cluster to list backups from.  Values are of the
    * form `projects/{project}/instances/{instance}/clusters/{cluster}`.
    * Use `{cluster} = '-'` to list backups for all clusters in an instance,
    * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -66,7 +66,7 @@ public interface ListBackupsRequestOrBuilder
    * The expression must specify the field name, a comparison operator,
    * and the value that you want to use for filtering. The value must be a
    * string, a number, or a boolean. The comparison operator must be
-   * <, >, <=, >=, !=, =, or :. Colon ‘:’ represents a HAS operator which is
+   * <, >, <=, >=, !=, =, or :. Colon ':' represents a HAS operator which is
    * roughly synonymous with equality. Filter rules are case insensitive.
    * The fields eligible for filtering are:
    *   * `name`
@@ -105,7 +105,7 @@ public interface ListBackupsRequestOrBuilder
    * The expression must specify the field name, a comparison operator,
    * and the value that you want to use for filtering. The value must be a
    * string, a number, or a boolean. The comparison operator must be
-   * <, >, <=, >=, !=, =, or :. Colon ‘:’ represents a HAS operator which is
+   * <, >, <=, >=, !=, =, or :. Colon ':' represents a HAS operator which is
    * roughly synonymous with equality. Filter rules are case insensitive.
    * The fields eligible for filtering are:
    *   * `name`
@@ -142,9 +142,8 @@ public interface ListBackupsRequestOrBuilder
    *
    * 
    * An expression for specifying the sort order of the results of the request.
-   * The string value should specify one or more fields in
-   * [Backup][google.bigtable.admin.v2.Backup]. The full syntax is described at
-   * https://aip.dev/132#ordering.
+   * The string value should specify one or more fields in [Backup][google.bigtable.admin.v2.Backup]. The full
+   * syntax is described at https://aip.dev/132#ordering.
    * Fields supported are:
    *    * name
    *    * source_table
@@ -171,9 +170,8 @@ public interface ListBackupsRequestOrBuilder
    *
    * 
    * An expression for specifying the sort order of the results of the request.
-   * The string value should specify one or more fields in
-   * [Backup][google.bigtable.admin.v2.Backup]. The full syntax is described at
-   * https://aip.dev/132#ordering.
+   * The string value should specify one or more fields in [Backup][google.bigtable.admin.v2.Backup]. The full
+   * syntax is described at https://aip.dev/132#ordering.
    * Fields supported are:
    *    * name
    *    * source_table
@@ -215,10 +213,9 @@ public interface ListBackupsRequestOrBuilder
    *
    * 
    * If non-empty, `page_token` should contain a
-   * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token]
-   * from a previous
-   * [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the
-   * same `parent` and with the same `filter`.
+   * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token] from a
+   * previous [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the same `parent` and with the same
+   * `filter`.
    * 

    *
    * string page_token = 5;
@@ -231,10 +228,9 @@ public interface ListBackupsRequestOrBuilder
    *
    * 
    * If non-empty, `page_token` should contain a
-   * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token]
-   * from a previous
-   * [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the
-   * same `parent` and with the same `filter`.
+   * [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token] from a
+   * previous [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the same `parent` and with the same
+   * `filter`.
    * 

    *
    * string page_token = 5;
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponse.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponse.java
index 9574d48626..8c9138a8ff 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponse.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponse.java
@@ -22,8 +22,7 @@
  *
  *
  * 
- * The response for
- * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
+ * The response for [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
  * 

  *
  * Protobuf type {@code google.bigtable.admin.v2.ListBackupsResponse}
@@ -204,8 +203,8 @@ public com.google.bigtable.admin.v2.BackupOrBuilder getBackupsOrBuilder(int inde
    *
    * 
    * `next_page_token` can be sent in a subsequent
-   * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call
-   * to fetch more of the matching backups.
+   * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call to fetch more
+   * of the matching backups.
    * 

    *
    * string next_page_token = 2;
@@ -229,8 +228,8 @@ public java.lang.String getNextPageToken() {
    *
    * 
    * `next_page_token` can be sent in a subsequent
-   * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call
-   * to fetch more of the matching backups.
+   * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call to fetch more
+   * of the matching backups.
    * 

    *
    * string next_page_token = 2;
@@ -424,8 +423,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The response for
-   * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
+   * The response for [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
    * 

    *
    * Protobuf type {@code google.bigtable.admin.v2.ListBackupsResponse}
@@ -980,8 +978,8 @@ public java.util.List getBackupsBui
      *
      * 
      * `next_page_token` can be sent in a subsequent
-     * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call
-     * to fetch more of the matching backups.
+     * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call to fetch more
+     * of the matching backups.
      * 

      *
      * string next_page_token = 2;
@@ -1004,8 +1002,8 @@ public java.lang.String getNextPageToken() {
      *
      * 
      * `next_page_token` can be sent in a subsequent
-     * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call
-     * to fetch more of the matching backups.
+     * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call to fetch more
+     * of the matching backups.
      * 

      *
      * string next_page_token = 2;
@@ -1028,8 +1026,8 @@ public com.google.protobuf.ByteString getNextPageTokenBytes() {
      *
      * 
      * `next_page_token` can be sent in a subsequent
-     * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call
-     * to fetch more of the matching backups.
+     * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call to fetch more
+     * of the matching backups.
      * 

      *
      * string next_page_token = 2;
@@ -1051,8 +1049,8 @@ public Builder setNextPageToken(java.lang.String value) {
      *
      * 
      * `next_page_token` can be sent in a subsequent
-     * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call
-     * to fetch more of the matching backups.
+     * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call to fetch more
+     * of the matching backups.
      * 

      *
      * string next_page_token = 2;
@@ -1070,8 +1068,8 @@ public Builder clearNextPageToken() {
      *
      * 
      * `next_page_token` can be sent in a subsequent
-     * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call
-     * to fetch more of the matching backups.
+     * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call to fetch more
+     * of the matching backups.
      * 

      *
      * string next_page_token = 2;
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponseOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponseOrBuilder.java
index 21c6bd972b..99a982ec0d 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponseOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListBackupsResponseOrBuilder.java
@@ -79,8 +79,8 @@ public interface ListBackupsResponseOrBuilder
    *
    * 
    * `next_page_token` can be sent in a subsequent
-   * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call
-   * to fetch more of the matching backups.
+   * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call to fetch more
+   * of the matching backups.
    * 

    *
    * string next_page_token = 2;
@@ -93,8 +93,8 @@ public interface ListBackupsResponseOrBuilder
    *
    * 
    * `next_page_token` can be sent in a subsequent
-   * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call
-   * to fetch more of the matching backups.
+   * [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call to fetch more
+   * of the matching backups.
    * 

    *
    * string next_page_token = 2;
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
index 339b6466cd..9a34175110 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java
@@ -135,8 +135,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * 
-   * Required. The unique name of the cluster for which snapshots should be
-   * listed. Values are of the form
+   * Required. The unique name of the cluster for which snapshots should be listed.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/clusters/{cluster}`.
    * Use `{cluster} = '-'` to list snapshots for all clusters in an instance,
    * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -164,8 +164,8 @@ public java.lang.String getParent() {
    *
    *
    * 
-   * Required. The unique name of the cluster for which snapshots should be
-   * listed. Values are of the form
+   * Required. The unique name of the cluster for which snapshots should be listed.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/clusters/{cluster}`.
    * Use `{cluster} = '-'` to list snapshots for all clusters in an instance,
    * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -617,8 +617,8 @@ public Builder mergeFrom(
      *
      *
      * 
-     * Required. The unique name of the cluster for which snapshots should be
-     * listed. Values are of the form
+     * Required. The unique name of the cluster for which snapshots should be listed.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/clusters/{cluster}`.
      * Use `{cluster} = '-'` to list snapshots for all clusters in an instance,
      * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -645,8 +645,8 @@ public java.lang.String getParent() {
      *
      *
      * 
-     * Required. The unique name of the cluster for which snapshots should be
-     * listed. Values are of the form
+     * Required. The unique name of the cluster for which snapshots should be listed.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/clusters/{cluster}`.
      * Use `{cluster} = '-'` to list snapshots for all clusters in an instance,
      * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -673,8 +673,8 @@ public com.google.protobuf.ByteString getParentBytes() {
      *
      *
      * 
-     * Required. The unique name of the cluster for which snapshots should be
-     * listed. Values are of the form
+     * Required. The unique name of the cluster for which snapshots should be listed.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/clusters/{cluster}`.
      * Use `{cluster} = '-'` to list snapshots for all clusters in an instance,
      * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -700,8 +700,8 @@ public Builder setParent(java.lang.String value) {
      *
      *
      * 
-     * Required. The unique name of the cluster for which snapshots should be
-     * listed. Values are of the form
+     * Required. The unique name of the cluster for which snapshots should be listed.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/clusters/{cluster}`.
      * Use `{cluster} = '-'` to list snapshots for all clusters in an instance,
      * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -723,8 +723,8 @@ public Builder clearParent() {
      *
      *
      * 
-     * Required. The unique name of the cluster for which snapshots should be
-     * listed. Values are of the form
+     * Required. The unique name of the cluster for which snapshots should be listed.
+     * Values are of the form
      * `projects/{project}/instances/{instance}/clusters/{cluster}`.
      * Use `{cluster} = '-'` to list snapshots for all clusters in an instance,
      * e.g., `projects/{project}/instances/{instance}/clusters/-`.
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequestOrBuilder.java
index fb0671a680..8437c4e8da 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequestOrBuilder.java
@@ -27,8 +27,8 @@ public interface ListSnapshotsRequestOrBuilder
    *
    *
    * 
-   * Required. The unique name of the cluster for which snapshots should be
-   * listed. Values are of the form
+   * Required. The unique name of the cluster for which snapshots should be listed.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/clusters/{cluster}`.
    * Use `{cluster} = '-'` to list snapshots for all clusters in an instance,
    * e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -45,8 +45,8 @@ public interface ListSnapshotsRequestOrBuilder
    *
    *
    * 
-   * Required. The unique name of the cluster for which snapshots should be
-   * listed. Values are of the form
+   * Required. The unique name of the cluster for which snapshots should be listed.
+   * Values are of the form
    * `projects/{project}/instances/{instance}/clusters/{cluster}`.
    * Use `{cluster} = '-'` to list snapshots for all clusters in an instance,
    * e.g., `projects/{project}/instances/{instance}/clusters/-`.
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java
index 7575ebdda0..c3681d5a0c 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java
@@ -139,8 +139,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
    *
    *
    * 
-   * Required. The unique name of the instance for which tables should be
-   * listed. Values are of the form `projects/{project}/instances/{instance}`.
+   * Required. The unique name of the instance for which tables should be listed.
+   * Values are of the form `projects/{project}/instances/{instance}`.
    * 

    *
    * 
@@ -165,8 +165,8 @@ public java.lang.String getParent() {
    *
    *
    * 
-   * Required. The unique name of the instance for which tables should be
-   * listed. Values are of the form `projects/{project}/instances/{instance}`.
+   * Required. The unique name of the instance for which tables should be listed.
+   * Values are of the form `projects/{project}/instances/{instance}`.
    * 

    *
    * 
@@ -667,8 +667,8 @@ public Builder mergeFrom(
      *
      *
      * 
-     * Required. The unique name of the instance for which tables should be
-     * listed. Values are of the form `projects/{project}/instances/{instance}`.
+     * Required. The unique name of the instance for which tables should be listed.
+     * Values are of the form `projects/{project}/instances/{instance}`.
      * 

      *
      * 
@@ -692,8 +692,8 @@ public java.lang.String getParent() {
      *
      *
      * 
-     * Required. The unique name of the instance for which tables should be
-     * listed. Values are of the form `projects/{project}/instances/{instance}`.
+     * Required. The unique name of the instance for which tables should be listed.
+     * Values are of the form `projects/{project}/instances/{instance}`.
      * 

      *
      * 
@@ -717,8 +717,8 @@ public com.google.protobuf.ByteString getParentBytes() {
      *
      *
      * 
-     * Required. The unique name of the instance for which tables should be
-     * listed. Values are of the form `projects/{project}/instances/{instance}`.
+     * Required. The unique name of the instance for which tables should be listed.
+     * Values are of the form `projects/{project}/instances/{instance}`.
      * 

      *
      * 
@@ -741,8 +741,8 @@ public Builder setParent(java.lang.String value) {
      *
      *
      * 
-     * Required. The unique name of the instance for which tables should be
-     * listed. Values are of the form `projects/{project}/instances/{instance}`.
+     * Required. The unique name of the instance for which tables should be listed.
+     * Values are of the form `projects/{project}/instances/{instance}`.
      * 

      *
      * 
@@ -761,8 +761,8 @@ public Builder clearParent() {
      *
      *
      * 
-     * Required. The unique name of the instance for which tables should be
-     * listed. Values are of the form `projects/{project}/instances/{instance}`.
+     * Required. The unique name of the instance for which tables should be listed.
+     * Values are of the form `projects/{project}/instances/{instance}`.
      * 

      *
      * 
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequestOrBuilder.java
index 68f4ffbb0f..7497be7075 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequestOrBuilder.java
@@ -27,8 +27,8 @@ public interface ListTablesRequestOrBuilder
    *
    *
    * 
-   * Required. The unique name of the instance for which tables should be
-   * listed. Values are of the form `projects/{project}/instances/{instance}`.
+   * Required. The unique name of the instance for which tables should be listed.
+   * Values are of the form `projects/{project}/instances/{instance}`.
    * 

    *
    * 
@@ -42,8 +42,8 @@ public interface ListTablesRequestOrBuilder
    *
    *
    * 
-   * Required. The unique name of the instance for which tables should be
-   * listed. Values are of the form `projects/{project}/instances/{instance}`.
+   * Required. The unique name of the instance for which tables should be listed.
+   * Values are of the form `projects/{project}/instances/{instance}`.
    * 

    *
    * 
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
index ffefc3f0e9..3559bf67d0 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java
@@ -1775,10 +1775,10 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    *
    * 
-   * Required. Modifications to be atomically applied to the specified table's
-   * families. Entries are applied in order, meaning that earlier modifications
-   * can be masked by later ones (in the case of repeated updates to the same
-   * family, for example).
+   * Required. Modifications to be atomically applied to the specified table's families.
+   * Entries are applied in order, meaning that earlier modifications can be
+   * masked by later ones (in the case of repeated updates to the same family,
+   * for example).
    * 

    *
    * 
@@ -1794,10 +1794,10 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    *
    * 
-   * Required. Modifications to be atomically applied to the specified table's
-   * families. Entries are applied in order, meaning that earlier modifications
-   * can be masked by later ones (in the case of repeated updates to the same
-   * family, for example).
+   * Required. Modifications to be atomically applied to the specified table's families.
+   * Entries are applied in order, meaning that earlier modifications can be
+   * masked by later ones (in the case of repeated updates to the same family,
+   * for example).
    * 

    *
    * 
@@ -1814,10 +1814,10 @@ public com.google.protobuf.ByteString getNameBytes() {
    *
    *
    * 
-   * Required. Modifications to be atomically applied to the specified table's
-   * families. Entries are applied in order, meaning that earlier modifications
-   * can be masked by later ones (in the case of repeated updates to the same
-   * family, for example).
+   * Required. Modifications to be atomically applied to the specified table's families.
+   * Entries are applied in order, meaning that earlier modifications can be
+   * masked by later ones (in the case of repeated updates to the same family,
+   * for example).
    * 

    *
    * 
@@ -1832,10 +1832,10 @@ public int getModificationsCount() {
    *
    *
    * 
-   * Required. Modifications to be atomically applied to the specified table's
-   * families. Entries are applied in order, meaning that earlier modifications
-   * can be masked by later ones (in the case of repeated updates to the same
-   * family, for example).
+   * Required. Modifications to be atomically applied to the specified table's families.
+   * Entries are applied in order, meaning that earlier modifications can be
+   * masked by later ones (in the case of repeated updates to the same family,
+   * for example).
    * 

    *
    * 
@@ -1851,10 +1851,10 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification get
    *
    *
    * 
-   * Required. Modifications to be atomically applied to the specified table's
-   * families. Entries are applied in order, meaning that earlier modifications
-   * can be masked by later ones (in the case of repeated updates to the same
-   * family, for example).
+   * Required. Modifications to be atomically applied to the specified table's families.
+   * Entries are applied in order, meaning that earlier modifications can be
+   * masked by later ones (in the case of repeated updates to the same family,
+   * for example).
    * 

    *
    * 
@@ -2394,10 +2394,10 @@ private void ensureModificationsIsMutable() {
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2416,10 +2416,10 @@ private void ensureModificationsIsMutable() {
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2437,10 +2437,10 @@ public int getModificationsCount() {
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2459,10 +2459,10 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification get
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2487,10 +2487,10 @@ public Builder setModifications(
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2514,10 +2514,10 @@ public Builder setModifications(
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2542,10 +2542,10 @@ public Builder addModifications(
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2570,10 +2570,10 @@ public Builder addModifications(
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2596,10 +2596,10 @@ public Builder addModifications(
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2623,10 +2623,10 @@ public Builder addModifications(
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2650,10 +2650,10 @@ public Builder addAllModifications(
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2674,10 +2674,10 @@ public Builder clearModifications() {
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2698,10 +2698,10 @@ public Builder removeModifications(int index) {
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2716,10 +2716,10 @@ public Builder removeModifications(int index) {
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2738,10 +2738,10 @@ public Builder removeModifications(int index) {
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2762,10 +2762,10 @@ public Builder removeModifications(int index) {
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2783,10 +2783,10 @@ public Builder removeModifications(int index) {
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
@@ -2805,10 +2805,10 @@ public Builder removeModifications(int index) {
      *
      *
      * 
-     * Required. Modifications to be atomically applied to the specified table's
-     * families. Entries are applied in order, meaning that earlier modifications
-     * can be masked by later ones (in the case of repeated updates to the same
-     * family, for example).
+     * Required. Modifications to be atomically applied to the specified table's families.
+     * Entries are applied in order, meaning that earlier modifications can be
+     * masked by later ones (in the case of repeated updates to the same family,
+     * for example).
      * 

      *
      * 
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequestOrBuilder.java
index 0444a17fcc..374bbc2440 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequestOrBuilder.java
@@ -60,10 +60,10 @@ public interface ModifyColumnFamiliesRequestOrBuilder
    *
    *
    * 
-   * Required. Modifications to be atomically applied to the specified table's
-   * families. Entries are applied in order, meaning that earlier modifications
-   * can be masked by later ones (in the case of repeated updates to the same
-   * family, for example).
+   * Required. Modifications to be atomically applied to the specified table's families.
+   * Entries are applied in order, meaning that earlier modifications can be
+   * masked by later ones (in the case of repeated updates to the same family,
+   * for example).
    * 

    *
    * 
@@ -76,10 +76,10 @@ public interface ModifyColumnFamiliesRequestOrBuilder
    *
    *
    * 
-   * Required. Modifications to be atomically applied to the specified table's
-   * families. Entries are applied in order, meaning that earlier modifications
-   * can be masked by later ones (in the case of repeated updates to the same
-   * family, for example).
+   * Required. Modifications to be atomically applied to the specified table's families.
+   * Entries are applied in order, meaning that earlier modifications can be
+   * masked by later ones (in the case of repeated updates to the same family,
+   * for example).
    * 

    *
    * 
@@ -91,10 +91,10 @@ public interface ModifyColumnFamiliesRequestOrBuilder
    *
    *
    * 
-   * Required. Modifications to be atomically applied to the specified table's
-   * families. Entries are applied in order, meaning that earlier modifications
-   * can be masked by later ones (in the case of repeated updates to the same
-   * family, for example).
+   * Required. Modifications to be atomically applied to the specified table's families.
+   * Entries are applied in order, meaning that earlier modifications can be
+   * masked by later ones (in the case of repeated updates to the same family,
+   * for example).
    * 

    *
    * 
@@ -106,10 +106,10 @@ public interface ModifyColumnFamiliesRequestOrBuilder
    *
    *
    * 
-   * Required. Modifications to be atomically applied to the specified table's
-   * families. Entries are applied in order, meaning that earlier modifications
-   * can be masked by later ones (in the case of repeated updates to the same
-   * family, for example).
+   * Required. Modifications to be atomically applied to the specified table's families.
+   * Entries are applied in order, meaning that earlier modifications can be
+   * masked by later ones (in the case of repeated updates to the same family,
+   * for example).
    * 

    *
    * 
@@ -123,10 +123,10 @@ public interface ModifyColumnFamiliesRequestOrBuilder
    *
    *
    * 
-   * Required. Modifications to be atomically applied to the specified table's
-   * families. Entries are applied in order, meaning that earlier modifications
-   * can be masked by later ones (in the case of repeated updates to the same
-   * family, for example).
+   * Required. Modifications to be atomically applied to the specified table's families.
+   * Entries are applied in order, meaning that earlier modifications can be
+   * masked by later ones (in the case of repeated updates to the same family,
+   * for example).
    * 

    *
    * 
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadata.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadata.java
index 51e57e90dc..61980e5447 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadata.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadata.java
@@ -391,8 +391,7 @@ public com.google.protobuf.ByteString getOptimizeTableOperationNameBytes() {
    *
    *
    * 
-   * The progress of the
-   * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+   * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
    * operation.
    * 

    *
@@ -408,8 +407,7 @@ public boolean hasProgress() {
    *
    *
    * 
-   * The progress of the
-   * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+   * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
    * operation.
    * 

    *
@@ -427,8 +425,7 @@ public com.google.bigtable.admin.v2.OperationProgress getProgress() {
    *
    *
    * 
-   * The progress of the
-   * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+   * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
    * operation.
    * 

    *
@@ -1375,8 +1372,7 @@ public Builder setOptimizeTableOperationNameBytes(com.google.protobuf.ByteString
      *
      *
      * 
-     * The progress of the
-     * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+     * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
      * operation.
      * 

      *
@@ -1391,8 +1387,7 @@ public boolean hasProgress() {
      *
      *
      * 
-     * The progress of the
-     * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+     * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
      * operation.
      * 

      *
@@ -1413,8 +1408,7 @@ public com.google.bigtable.admin.v2.OperationProgress getProgress() {
      *
      *
      * 
-     * The progress of the
-     * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+     * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
      * operation.
      * 

      *
@@ -1437,8 +1431,7 @@ public Builder setProgress(com.google.bigtable.admin.v2.OperationProgress value)
      *
      *
      * 
-     * The progress of the
-     * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+     * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
      * operation.
      * 

      *
@@ -1459,8 +1452,7 @@ public Builder setProgress(
      *
      *
      * 
-     * The progress of the
-     * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+     * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
      * operation.
      * 

      *
@@ -1487,8 +1479,7 @@ public Builder mergeProgress(com.google.bigtable.admin.v2.OperationProgress valu
      *
      *
      * 
-     * The progress of the
-     * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+     * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
      * operation.
      * 

      *
@@ -1509,8 +1500,7 @@ public Builder clearProgress() {
      *
      *
      * 
-     * The progress of the
-     * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+     * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
      * operation.
      * 

      *
@@ -1525,8 +1515,7 @@ public com.google.bigtable.admin.v2.OperationProgress.Builder getProgressBuilder
      *
      *
      * 
-     * The progress of the
-     * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+     * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
      * operation.
      * 

      *
@@ -1545,8 +1534,7 @@ public com.google.bigtable.admin.v2.OperationProgressOrBuilder getProgressOrBuil
      *
      *
      * 
-     * The progress of the
-     * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+     * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
      * operation.
      * 

      *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadataOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadataOrBuilder.java
index 452699b298..514e02881e 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadataOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableMetadataOrBuilder.java
@@ -133,8 +133,7 @@ public interface RestoreTableMetadataOrBuilder
    *
    *
    * 
-   * The progress of the
-   * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+   * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
    * operation.
    * 

    *
@@ -147,8 +146,7 @@ public interface RestoreTableMetadataOrBuilder
    *
    *
    * 
-   * The progress of the
-   * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+   * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
    * operation.
    * 

    *
@@ -161,8 +159,7 @@ public interface RestoreTableMetadataOrBuilder
    *
    *
    * 
-   * The progress of the
-   * [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+   * The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
    * operation.
    * 

    *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java
index 7247feeab0..4013878d53 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequest.java
@@ -182,7 +182,9 @@ public SourceCase getSourceCase() {
    * of the form `projects/<project>/instances/<instance>`.
    * 

    *
-   * string parent = 1;
+   * 
+   * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * 
    *
    * @return The parent.
    */
@@ -207,7 +209,9 @@ public java.lang.String getParent() {
    * of the form `projects/<project>/instances/<instance>`.
    * 

    *
-   * string parent = 1;
+   * 
+   * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * 
    *
    * @return The bytes for parent.
    */
@@ -236,7 +240,7 @@ public com.google.protobuf.ByteString getParentBytes() {
    * `projects/<project>/instances/<instance>/tables/<table_id>`.
    * 

    *
-   * string table_id = 2;
+   * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
    *
    * @return The tableId.
    */
@@ -262,7 +266,7 @@ public java.lang.String getTableId() {
    * `projects/<project>/instances/<instance>/tables/<table_id>`.
    * 

    *
-   * string table_id = 2;
+   * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
    *
    * @return The bytes for tableId.
    */
@@ -284,11 +288,11 @@ public com.google.protobuf.ByteString getTableIdBytes() {
    *
    *
    * 
-   * Name of the backup from which to restore. Values are of the form
+   * Name of the backup from which to restore.  Values are of the form
    * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
    * 

    *
-   * string backup = 3;
+   * string backup = 3 [(.google.api.resource_reference) = { ... }
    *
    * @return The backup.
    */
@@ -312,11 +316,11 @@ public java.lang.String getBackup() {
    *
    *
    * 
-   * Name of the backup from which to restore. Values are of the form
+   * Name of the backup from which to restore.  Values are of the form
    * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
    * 

    *
-   * string backup = 3;
+   * string backup = 3 [(.google.api.resource_reference) = { ... }
    *
    * @return The bytes for backup.
    */
@@ -736,7 +740,9 @@ public Builder clearSource() {
      * of the form `projects/<project>/instances/<instance>`.
      * 

      *
-     * string parent = 1;
+     * 
+     * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * 
      *
      * @return The parent.
      */
@@ -760,7 +766,9 @@ public java.lang.String getParent() {
      * of the form `projects/<project>/instances/<instance>`.
      * 

      *
-     * string parent = 1;
+     * 
+     * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * 
      *
      * @return The bytes for parent.
      */
@@ -784,7 +792,9 @@ public com.google.protobuf.ByteString getParentBytes() {
      * of the form `projects/<project>/instances/<instance>`.
      * 

      *
-     * string parent = 1;
+     * 
+     * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * 
      *
      * @param value The parent to set.
      * @return This builder for chaining.
@@ -807,7 +817,9 @@ public Builder setParent(java.lang.String value) {
      * of the form `projects/<project>/instances/<instance>`.
      * 

      *
-     * string parent = 1;
+     * 
+     * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * 
      *
      * @return This builder for chaining.
      */
@@ -826,7 +838,9 @@ public Builder clearParent() {
      * of the form `projects/<project>/instances/<instance>`.
      * 

      *
-     * string parent = 1;
+     * 
+     * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+     * 
      *
      * @param value The bytes for parent to set.
      * @return This builder for chaining.
@@ -853,7 +867,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) {
      * `projects/<project>/instances/<instance>/tables/<table_id>`.
      * 

      *
-     * string table_id = 2;
+     * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
      *
      * @return The tableId.
      */
@@ -878,7 +892,7 @@ public java.lang.String getTableId() {
      * `projects/<project>/instances/<instance>/tables/<table_id>`.
      * 

      *
-     * string table_id = 2;
+     * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
      *
      * @return The bytes for tableId.
      */
@@ -903,7 +917,7 @@ public com.google.protobuf.ByteString getTableIdBytes() {
      * `projects/<project>/instances/<instance>/tables/<table_id>`.
      * 

      *
-     * string table_id = 2;
+     * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
      *
      * @param value The tableId to set.
      * @return This builder for chaining.
@@ -927,7 +941,7 @@ public Builder setTableId(java.lang.String value) {
      * `projects/<project>/instances/<instance>/tables/<table_id>`.
      * 

      *
-     * string table_id = 2;
+     * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
      *
      * @return This builder for chaining.
      */
@@ -947,7 +961,7 @@ public Builder clearTableId() {
      * `projects/<project>/instances/<instance>/tables/<table_id>`.
      * 

      *
-     * string table_id = 2;
+     * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
      *
      * @param value The bytes for tableId to set.
      * @return This builder for chaining.
@@ -967,11 +981,11 @@ public Builder setTableIdBytes(com.google.protobuf.ByteString value) {
      *
      *
      * 
-     * Name of the backup from which to restore. Values are of the form
+     * Name of the backup from which to restore.  Values are of the form
      * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
      * 

      *
-     * string backup = 3;
+     * string backup = 3 [(.google.api.resource_reference) = { ... }
      *
      * @return The backup.
      */
@@ -996,11 +1010,11 @@ public java.lang.String getBackup() {
      *
      *
      * 
-     * Name of the backup from which to restore. Values are of the form
+     * Name of the backup from which to restore.  Values are of the form
      * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
      * 

      *
-     * string backup = 3;
+     * string backup = 3 [(.google.api.resource_reference) = { ... }
      *
      * @return The bytes for backup.
      */
@@ -1025,11 +1039,11 @@ public com.google.protobuf.ByteString getBackupBytes() {
      *
      *
      * 
-     * Name of the backup from which to restore. Values are of the form
+     * Name of the backup from which to restore.  Values are of the form
      * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
      * 

      *
-     * string backup = 3;
+     * string backup = 3 [(.google.api.resource_reference) = { ... }
      *
      * @param value The backup to set.
      * @return This builder for chaining.
@@ -1047,11 +1061,11 @@ public Builder setBackup(java.lang.String value) {
      *
      *
      * 
-     * Name of the backup from which to restore. Values are of the form
+     * Name of the backup from which to restore.  Values are of the form
      * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
      * 

      *
-     * string backup = 3;
+     * string backup = 3 [(.google.api.resource_reference) = { ... }
      *
      * @return This builder for chaining.
      */
@@ -1067,11 +1081,11 @@ public Builder clearBackup() {
      *
      *
      * 
-     * Name of the backup from which to restore. Values are of the form
+     * Name of the backup from which to restore.  Values are of the form
      * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
      * 

      *
-     * string backup = 3;
+     * string backup = 3 [(.google.api.resource_reference) = { ... }
      *
      * @param value The bytes for backup to set.
      * @return This builder for chaining.
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequestOrBuilder.java
index 840eccc207..16130d7f0c 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/RestoreTableRequestOrBuilder.java
@@ -32,7 +32,9 @@ public interface RestoreTableRequestOrBuilder
    * of the form `projects/<project>/instances/<instance>`.
    * 

    *
-   * string parent = 1;
+   * 
+   * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * 
    *
    * @return The parent.
    */
@@ -46,7 +48,9 @@ public interface RestoreTableRequestOrBuilder
    * of the form `projects/<project>/instances/<instance>`.
    * 

    *
-   * string parent = 1;
+   * 
+   * string parent = 1 [(.google.api.field_behavior) = REQUIRED, (.google.api.resource_reference) = { ... }
+   * 
    *
    * @return The bytes for parent.
    */
@@ -62,7 +66,7 @@ public interface RestoreTableRequestOrBuilder
    * `projects/<project>/instances/<instance>/tables/<table_id>`.
    * 

    *
-   * string table_id = 2;
+   * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
    *
    * @return The tableId.
    */
@@ -77,7 +81,7 @@ public interface RestoreTableRequestOrBuilder
    * `projects/<project>/instances/<instance>/tables/<table_id>`.
    * 

    *
-   * string table_id = 2;
+   * string table_id = 2 [(.google.api.field_behavior) = REQUIRED];
    *
    * @return The bytes for tableId.
    */
@@ -87,11 +91,11 @@ public interface RestoreTableRequestOrBuilder
    *
    *
    * 
-   * Name of the backup from which to restore. Values are of the form
+   * Name of the backup from which to restore.  Values are of the form
    * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
    * 

    *
-   * string backup = 3;
+   * string backup = 3 [(.google.api.resource_reference) = { ... }
    *
    * @return The backup.
    */
@@ -100,11 +104,11 @@ public interface RestoreTableRequestOrBuilder
    *
    *
    * 
-   * Name of the backup from which to restore. Values are of the form
+   * Name of the backup from which to restore.  Values are of the form
    * `projects/<project>/instances/<instance>/clusters/<cluster>/backups/<backup>`.
    * 

    *
-   * string backup = 3;
+   * string backup = 3 [(.google.api.resource_reference) = { ... }
    *
    * @return The bytes for backup.
    */
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
index 7c03a3aa63..f031f08158 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java
@@ -274,9 +274,9 @@ public com.google.protobuf.ByteString getClusterBytes() {
    *
    *
    * 
-   * Required. The ID by which the new snapshot should be referred to within the
-   * parent cluster, e.g., `mysnapshot` of the form:
-   * `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` rather than
+   * Required. The ID by which the new snapshot should be referred to within the parent
+   * cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
+   * rather than
    * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`.
    * 

    *
@@ -300,9 +300,9 @@ public java.lang.String getSnapshotId() {
    *
    *
    * 
-   * Required. The ID by which the new snapshot should be referred to within the
-   * parent cluster, e.g., `mysnapshot` of the form:
-   * `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` rather than
+   * Required. The ID by which the new snapshot should be referred to within the parent
+   * cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
+   * rather than
    * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`.
    * 

    *
@@ -1083,9 +1083,9 @@ public Builder setClusterBytes(com.google.protobuf.ByteString value) {
      *
      *
      * 
-     * Required. The ID by which the new snapshot should be referred to within the
-     * parent cluster, e.g., `mysnapshot` of the form:
-     * `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` rather than
+     * Required. The ID by which the new snapshot should be referred to within the parent
+     * cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
+     * rather than
      * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`.
      * 

      *
@@ -1108,9 +1108,9 @@ public java.lang.String getSnapshotId() {
      *
      *
      * 
-     * Required. The ID by which the new snapshot should be referred to within the
-     * parent cluster, e.g., `mysnapshot` of the form:
-     * `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` rather than
+     * Required. The ID by which the new snapshot should be referred to within the parent
+     * cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
+     * rather than
      * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`.
      * 

      *
@@ -1133,9 +1133,9 @@ public com.google.protobuf.ByteString getSnapshotIdBytes() {
      *
      *
      * 
-     * Required. The ID by which the new snapshot should be referred to within the
-     * parent cluster, e.g., `mysnapshot` of the form:
-     * `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` rather than
+     * Required. The ID by which the new snapshot should be referred to within the parent
+     * cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
+     * rather than
      * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`.
      * 

      *
@@ -1157,9 +1157,9 @@ public Builder setSnapshotId(java.lang.String value) {
      *
      *
      * 
-     * Required. The ID by which the new snapshot should be referred to within the
-     * parent cluster, e.g., `mysnapshot` of the form:
-     * `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` rather than
+     * Required. The ID by which the new snapshot should be referred to within the parent
+     * cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
+     * rather than
      * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`.
      * 

      *
@@ -1177,9 +1177,9 @@ public Builder clearSnapshotId() {
      *
      *
      * 
-     * Required. The ID by which the new snapshot should be referred to within the
-     * parent cluster, e.g., `mysnapshot` of the form:
-     * `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` rather than
+     * Required. The ID by which the new snapshot should be referred to within the parent
+     * cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
+     * rather than
      * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`.
      * 

      *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequestOrBuilder.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequestOrBuilder.java
index 13208ac2f9..292359964b 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequestOrBuilder.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequestOrBuilder.java
@@ -93,9 +93,9 @@ public interface SnapshotTableRequestOrBuilder
    *
    *
    * 
-   * Required. The ID by which the new snapshot should be referred to within the
-   * parent cluster, e.g., `mysnapshot` of the form:
-   * `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` rather than
+   * Required. The ID by which the new snapshot should be referred to within the parent
+   * cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
+   * rather than
    * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`.
    * 

    *
@@ -108,9 +108,9 @@ public interface SnapshotTableRequestOrBuilder
    *
    *
    * 
-   * Required. The ID by which the new snapshot should be referred to within the
-   * parent cluster, e.g., `mysnapshot` of the form:
-   * `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` rather than
+   * Required. The ID by which the new snapshot should be referred to within the parent
+   * cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
+   * rather than
    * `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`.
    * 

    *
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateBackupRequest.java b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateBackupRequest.java
index 28fb56f4ac..7af8d13bc6 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateBackupRequest.java
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateBackupRequest.java
@@ -22,8 +22,7 @@
  *
  *
  * 
- * The request for
- * [UpdateBackup][google.bigtable.admin.v2.BigtableTableAdmin.UpdateBackup].
+ * The request for [UpdateBackup][google.bigtable.admin.v2.BigtableTableAdmin.UpdateBackup].
  * 

  *
  * Protobuf type {@code google.bigtable.admin.v2.UpdateBackupRequest}
@@ -435,8 +434,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
    *
    *
    * 
-   * The request for
-   * [UpdateBackup][google.bigtable.admin.v2.BigtableTableAdmin.UpdateBackup].
+   * The request for [UpdateBackup][google.bigtable.admin.v2.BigtableTableAdmin.UpdateBackup].
    * 

    *
    * Protobuf type {@code google.bigtable.admin.v2.UpdateBackupRequest}
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_instance_admin.proto b/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_instance_admin.proto
index 8b19b55822..ca3aaed7a1 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_instance_admin.proto
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_instance_admin.proto
@@ -1,4 +1,4 @@
-// Copyright 2019 Google LLC.
+// Copyright 2020 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,7 +11,6 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-//
 
 syntax = "proto3";
 
@@ -565,9 +564,11 @@ message DeleteAppProfileRequest {
     }
   ];
 
-  // If true, ignore safety checks when deleting the app profile.
-  bool ignore_warnings = 2;
+  // Required. If true, ignore safety checks when deleting the app profile.
+  bool ignore_warnings = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
 // The metadata for the Operation returned by UpdateAppProfile.
-message UpdateAppProfileMetadata {}
+message UpdateAppProfileMetadata {
+
+}
diff --git a/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto b/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto
index 6f434a4735..d979dba597 100644
--- a/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto
+++ b/proto-google-cloud-bigtable-admin-v2/src/main/proto/google/bigtable/admin/v2/bigtable_table_admin.proto
@@ -72,8 +72,7 @@ service BigtableTableAdmin {
   // feature might be changed in backward-incompatible ways and is not
   // recommended for production use. It is not subject to any SLA or deprecation
   // policy.
-  rpc CreateTableFromSnapshot(CreateTableFromSnapshotRequest)
-      returns (google.longrunning.Operation) {
+  rpc CreateTableFromSnapshot(CreateTableFromSnapshotRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/instances/*}/tables:createFromSnapshot"
       body: "*"
@@ -135,8 +134,7 @@ service BigtableTableAdmin {
   // CheckConsistency to check whether mutations to the table that finished
   // before this call started have been replicated. The tokens will be available
   // for 90 days.
-  rpc GenerateConsistencyToken(GenerateConsistencyTokenRequest)
-      returns (GenerateConsistencyTokenResponse) {
+  rpc GenerateConsistencyToken(GenerateConsistencyTokenRequest) returns (GenerateConsistencyTokenResponse) {
     option (google.api.http) = {
       post: "/v2/{name=projects/*/instances/*/tables/*}:generateConsistencyToken"
       body: "*"
@@ -147,8 +145,7 @@ service BigtableTableAdmin {
   // Checks replication consistency based on a consistency token, that is, if
   // replication has caught up based on the conditions specified in the token
   // and the check request.
-  rpc CheckConsistency(CheckConsistencyRequest)
-      returns (CheckConsistencyResponse) {
+  rpc CheckConsistency(CheckConsistencyRequest) returns (CheckConsistencyResponse) {
     option (google.api.http) = {
       post: "/v2/{name=projects/*/instances/*/tables/*}:checkConsistency"
       body: "*"
@@ -164,14 +161,12 @@ service BigtableTableAdmin {
   // feature might be changed in backward-incompatible ways and is not
   // recommended for production use. It is not subject to any SLA or deprecation
   // policy.
-  rpc SnapshotTable(SnapshotTableRequest)
-      returns (google.longrunning.Operation) {
+  rpc SnapshotTable(SnapshotTableRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{name=projects/*/instances/*/tables/*}:snapshot"
       body: "*"
     };
-    option (google.api.method_signature) =
-        "name,cluster,snapshot_id,description";
+    option (google.api.method_signature) = "name,cluster,snapshot_id,description";
     option (google.longrunning.operation_info) = {
       response_type: "Snapshot"
       metadata_type: "SnapshotTableMetadata"
@@ -220,24 +215,24 @@ service BigtableTableAdmin {
     option (google.api.method_signature) = "name";
   }
 
-  // Starts creating a new Cloud Bigtable Backup. The returned backup
+  // Starts creating a new Cloud Bigtable Backup.  The returned backup
   // [long-running operation][google.longrunning.Operation] can be used to
   // track creation of the backup. The
   // [metadata][google.longrunning.Operation.metadata] field type is
   // [CreateBackupMetadata][google.bigtable.admin.v2.CreateBackupMetadata]. The
   // [response][google.longrunning.Operation.response] field type is
-  // [Backup][google.bigtable.admin.v2.Backup], if successful. Cancelling the
-  // returned operation will stop the creation and delete the backup.
+  // [Backup][google.bigtable.admin.v2.Backup], if successful. Cancelling the returned operation will stop the
+  // creation and delete the backup.
   rpc CreateBackup(CreateBackupRequest) returns (google.longrunning.Operation) {
     option (google.api.http) = {
       post: "/v2/{parent=projects/*/instances/*/clusters/*}/backups"
       body: "backup"
     };
+    option (google.api.method_signature) = "parent,backup_id,backup";
     option (google.longrunning.operation_info) = {
       response_type: "Backup"
       metadata_type: "CreateBackupMetadata"
     };
-    option (google.api.method_signature) = "parent,backup_id,backup";
   }
 
   // Gets metadata on a pending or completed Cloud Bigtable Backup.
@@ -275,11 +270,11 @@ service BigtableTableAdmin {
   }
 
   // Create a new table by restoring from a completed backup. The new table
-  // must be in the same instance as the instance containing the backup. The
+  // must be in the same instance as the instance containing the backup.  The
   // returned table [long-running operation][google.longrunning.Operation] can
-  // be used to track the progress of the operation, and to cancel it. The
+  // be used to track the progress of the operation, and to cancel it.  The
   // [metadata][google.longrunning.Operation.metadata] field type is
-  // [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata]. The
+  // [RestoreTableMetadata][google.bigtable.admin.RestoreTableMetadata].  The
   // [response][google.longrunning.Operation.response] type is
   // [Table][google.bigtable.admin.v2.Table], if successful.
   rpc RestoreTable(RestoreTableRequest) returns (google.longrunning.Operation) {
@@ -293,22 +288,24 @@ service BigtableTableAdmin {
     };
   }
 
-  // Gets the access control policy for a resource.
+  // Gets the access control policy for a Table or Backup resource.
   // Returns an empty policy if the resource exists but does not have a policy
   // set.
-  rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest)
-      returns (google.iam.v1.Policy) {
+  rpc GetIamPolicy(google.iam.v1.GetIamPolicyRequest) returns (google.iam.v1.Policy) {
     option (google.api.http) = {
       post: "/v2/{resource=projects/*/instances/*/tables/*}:getIamPolicy"
       body: "*"
+      additional_bindings {
+        post: "/v2/{resource=projects/*/instances/*/clusters/*/backups/*}:getIamPolicy"
+        body: "*"
+      }
     };
     option (google.api.method_signature) = "resource";
   }
 
   // Sets the access control policy on a Table or Backup resource.
   // Replaces any existing policy.
-  rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest)
-      returns (google.iam.v1.Policy) {
+  rpc SetIamPolicy(google.iam.v1.SetIamPolicyRequest) returns (google.iam.v1.Policy) {
     option (google.api.http) = {
       post: "/v2/{resource=projects/*/instances/*/tables/*}:setIamPolicy"
       body: "*"
@@ -320,9 +317,8 @@ service BigtableTableAdmin {
     option (google.api.method_signature) = "resource,policy";
   }
 
-  // Returns permissions that the caller has on the specified table resource.
-  rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest)
-      returns (google.iam.v1.TestIamPermissionsResponse) {
+  // Returns permissions that the caller has on the specified Table or Backup resource.
+  rpc TestIamPermissions(google.iam.v1.TestIamPermissionsRequest) returns (google.iam.v1.TestIamPermissionsResponse) {
     option (google.api.http) = {
       post: "/v2/{resource=projects/*/instances/*/tables/*}:testIamPermissions"
       body: "*"
@@ -335,6 +331,78 @@ service BigtableTableAdmin {
   }
 }
 
+// The request for
+// [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable].
+message RestoreTableRequest {
+  // Required. The name of the instance in which to create the restored
+  // table. This instance must be the parent of the source backup. Values are
+  // of the form `projects//instances/`.
+  string parent = 1 [
+    (google.api.field_behavior) = REQUIRED,
+    (google.api.resource_reference) = {
+      type: "bigtable.googleapis.com/Instance"
+    }
+  ];
+
+  // Required. The id of the table to create and restore to. This
+  // table must not already exist. The `table_id` appended to
+  // `parent` forms the full table name of the form
+  // `projects//instances//tables/`.
+  string table_id = 2 [(google.api.field_behavior) = REQUIRED];
+
+  // Required. The source from which to restore.
+  oneof source {
+    // Name of the backup from which to restore.  Values are of the form
+    // `projects//instances//clusters//backups/`.
+    string backup = 3 [(google.api.resource_reference) = {
+                         type: "bigtable.googleapis.com/Backup"
+                       }];
+  }
+}
+
+// Metadata type for the long-running operation returned by
+// [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable].
+message RestoreTableMetadata {
+  // Name of the table being created and restored to.
+  string name = 1;
+
+  // The type of the restore source.
+  RestoreSourceType source_type = 2;
+
+  // Information about the source used to restore the table, as specified by
+  // `source` in [RestoreTableRequest][google.bigtable.admin.v2.RestoreTableRequest].
+  oneof source_info {
+    BackupInfo backup_info = 3;
+  }
+
+  // If exists, the name of the long-running operation that will be used to
+  // track the post-restore optimization process to optimize the performance of
+  // the restored table. The metadata type of the long-running operation is
+  // [OptimizeRestoreTableMetadata][]. The response type is
+  // [Empty][google.protobuf.Empty]. This long-running operation may be
+  // automatically created by the system if applicable after the
+  // RestoreTable long-running operation completes successfully. This operation
+  // may not be created if the table is already optimized or the restore was
+  // not successful.
+  string optimize_table_operation_name = 4;
+
+  // The progress of the [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
+  // operation.
+  OperationProgress progress = 5;
+}
+
+// Metadata type for the long-running operation used to track the progress
+// of optimizations performed on a newly restored table. This long-running
+// operation is automatically created by the system after the successful
+// completion of a table restore, and cannot be cancelled.
+message OptimizeRestoredTableMetadata {
+  // Name of the restored table being optimized.
+  string name = 1;
+
+  // The progress of the post-restore optimizations.
+  OperationProgress progress = 2;
+}
+
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.CreateTable][google.bigtable.admin.v2.BigtableTableAdmin.CreateTable]
 message CreateTableRequest {
@@ -353,8 +421,8 @@ message CreateTableRequest {
     }
   ];
 
-  // Required. The name by which the new table should be referred to within the
-  // parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+  // Required. The name by which the new table should be referred to within the parent
+  // instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
   // Maximum 50 characters.
   string table_id = 2 [(google.api.field_behavior) = REQUIRED];
 
@@ -397,13 +465,13 @@ message CreateTableFromSnapshotRequest {
     }
   ];
 
-  // Required. The name by which the new table should be referred to within the
-  // parent instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
+  // Required. The name by which the new table should be referred to within the parent
+  // instance, e.g., `foobar` rather than `{parent}/tables/foobar`.
   string table_id = 2 [(google.api.field_behavior) = REQUIRED];
 
-  // Required. The unique name of the snapshot from which to restore the table.
-  // The snapshot and the table must be in the same instance. Values are of the
-  // form
+  // Required. The unique name of the snapshot from which to restore the table. The
+  // snapshot and the table must be in the same instance.
+  // Values are of the form
   // `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/{snapshot}`.
   string source_snapshot = 3 [
     (google.api.field_behavior) = REQUIRED,
@@ -421,7 +489,9 @@ message DropRowRangeRequest {
   // `projects/{project}/instances/{instance}/tables/{table}`.
   string name = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = { type: "bigtable.googleapis.com/Table" }
+    (google.api.resource_reference) = {
+      type: "bigtable.googleapis.com/Table"
+    }
   ];
 
   // Delete all rows or by prefix.
@@ -438,8 +508,8 @@ message DropRowRangeRequest {
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.ListTables][google.bigtable.admin.v2.BigtableTableAdmin.ListTables]
 message ListTablesRequest {
-  // Required. The unique name of the instance for which tables should be
-  // listed. Values are of the form `projects/{project}/instances/{instance}`.
+  // Required. The unique name of the instance for which tables should be listed.
+  // Values are of the form `projects/{project}/instances/{instance}`.
   string parent = 1 [
     (google.api.field_behavior) = REQUIRED,
     (google.api.resource_reference) = {
@@ -486,7 +556,9 @@ message GetTableRequest {
   // `projects/{project}/instances/{instance}/tables/{table}`.
   string name = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = { type: "bigtable.googleapis.com/Table" }
+    (google.api.resource_reference) = {
+      type: "bigtable.googleapis.com/Table"
+    }
   ];
 
   // The view to be applied to the returned table's fields.
@@ -502,7 +574,9 @@ message DeleteTableRequest {
   // `projects/{project}/instances/{instance}/tables/{table}`.
   string name = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = { type: "bigtable.googleapis.com/Table" }
+    (google.api.resource_reference) = {
+      type: "bigtable.googleapis.com/Table"
+    }
   ];
 }
 
@@ -535,26 +609,29 @@ message ModifyColumnFamiliesRequest {
   // `projects/{project}/instances/{instance}/tables/{table}`.
   string name = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = { type: "bigtable.googleapis.com/Table" }
+    (google.api.resource_reference) = {
+      type: "bigtable.googleapis.com/Table"
+    }
   ];
 
-  // Required. Modifications to be atomically applied to the specified table's
-  // families. Entries are applied in order, meaning that earlier modifications
-  // can be masked by later ones (in the case of repeated updates to the same
-  // family, for example).
-  repeated Modification modifications = 2
-      [(google.api.field_behavior) = REQUIRED];
+  // Required. Modifications to be atomically applied to the specified table's families.
+  // Entries are applied in order, meaning that earlier modifications can be
+  // masked by later ones (in the case of repeated updates to the same family,
+  // for example).
+  repeated Modification modifications = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken][google.bigtable.admin.v2.BigtableTableAdmin.GenerateConsistencyToken]
 message GenerateConsistencyTokenRequest {
-  // Required. The unique name of the Table for which to create a consistency
-  // token. Values are of the form
+  // Required. The unique name of the Table for which to create a consistency token.
+  // Values are of the form
   // `projects/{project}/instances/{instance}/tables/{table}`.
   string name = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = { type: "bigtable.googleapis.com/Table" }
+    (google.api.resource_reference) = {
+      type: "bigtable.googleapis.com/Table"
+    }
   ];
 }
 
@@ -568,12 +645,14 @@ message GenerateConsistencyTokenResponse {
 // Request message for
 // [google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency][google.bigtable.admin.v2.BigtableTableAdmin.CheckConsistency]
 message CheckConsistencyRequest {
-  // Required. The unique name of the Table for which to check replication
-  // consistency. Values are of the form
+  // Required. The unique name of the Table for which to check replication consistency.
+  // Values are of the form
   // `projects/{project}/instances/{instance}/tables/{table}`.
   string name = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = { type: "bigtable.googleapis.com/Table" }
+    (google.api.resource_reference) = {
+      type: "bigtable.googleapis.com/Table"
+    }
   ];
 
   // Required. The token created using GenerateConsistencyToken for the Table.
@@ -601,7 +680,9 @@ message SnapshotTableRequest {
   // `projects/{project}/instances/{instance}/tables/{table}`.
   string name = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = { type: "bigtable.googleapis.com/Table" }
+    (google.api.resource_reference) = {
+      type: "bigtable.googleapis.com/Table"
+    }
   ];
 
   // Required. The name of the cluster where the snapshot will be created in.
@@ -614,9 +695,9 @@ message SnapshotTableRequest {
     }
   ];
 
-  // Required. The ID by which the new snapshot should be referred to within the
-  // parent cluster, e.g., `mysnapshot` of the form:
-  // `[_a-zA-Z0-9][-_.a-zA-Z0-9]*` rather than
+  // Required. The ID by which the new snapshot should be referred to within the parent
+  // cluster, e.g., `mysnapshot` of the form: `[_a-zA-Z0-9][-_.a-zA-Z0-9]*`
+  // rather than
   // `projects/{project}/instances/{instance}/clusters/{cluster}/snapshots/mysnapshot`.
   string snapshot_id = 3 [(google.api.field_behavior) = REQUIRED];
 
@@ -657,8 +738,8 @@ message GetSnapshotRequest {
 // feature might be changed in backward-incompatible ways and is not recommended
 // for production use. It is not subject to any SLA or deprecation policy.
 message ListSnapshotsRequest {
-  // Required. The unique name of the cluster for which snapshots should be
-  // listed. Values are of the form
+  // Required. The unique name of the cluster for which snapshots should be listed.
+  // Values are of the form
   // `projects/{project}/instances/{instance}/clusters/{cluster}`.
   // Use `{cluster} = '-'` to list snapshots for all clusters in an instance,
   // e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -748,8 +829,7 @@ message CreateTableFromSnapshotMetadata {
   google.protobuf.Timestamp finish_time = 3;
 }
 
-// The request for
-// [CreateBackup][google.bigtable.admin.v2.BigtableTableAdmin.CreateBackup].
+// The request for [CreateBackup][google.bigtable.admin.v2.BigtableTableAdmin.CreateBackup].
 message CreateBackupRequest {
   // Required. This must be one of the clusters in the instance in which this
   // table is located. The backup will be stored in this cluster. Values are
@@ -789,20 +869,7 @@ message CreateBackupMetadata {
   google.protobuf.Timestamp end_time = 4;
 }
 
-// The request for
-// [GetBackup][google.bigtable.admin.v2.BigtableTableAdmin.GetBackup].
-message GetBackupRequest {
-  // Required. Name of the backup.
-  // Values are of the form
-  // `projects/{project}/instances/{instance}/clusters/{cluster}/backups/{backup}`.
-  string name = 1 [
-    (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = { type: "bigtable.googleapis.com/Backup" }
-  ];
-}
-
-// The request for
-// [UpdateBackup][google.bigtable.admin.v2.BigtableTableAdmin.UpdateBackup].
+// The request for [UpdateBackup][google.bigtable.admin.v2.BigtableTableAdmin.UpdateBackup].
 message UpdateBackupRequest {
   // Required. The backup to update. `backup.name`, and the fields to be updated
   // as specified by `update_mask` are required. Other fields are ignored.
@@ -815,26 +882,38 @@ message UpdateBackupRequest {
   // resource, not to the request message. The field mask must always be
   // specified; this prevents any future fields from being erased accidentally
   // by clients that do not know about them.
-  google.protobuf.FieldMask update_mask = 2
-      [(google.api.field_behavior) = REQUIRED];
+  google.protobuf.FieldMask update_mask = 2 [(google.api.field_behavior) = REQUIRED];
 }
 
-// The request for
-// [DeleteBackup][google.bigtable.admin.v2.BigtableTableAdmin.DeleteBackup].
+// The request for [GetBackup][google.bigtable.admin.v2.BigtableTableAdmin.GetBackup].
+message GetBackupRequest {
+  // Required. Name of the backup.
+  // Values are of the form
+  // `projects/{project}/instances/{instance}/clusters/{cluster}/backups/{backup}`.
+  string name = 1 [
+    (google.api.field_behavior) = REQUIRED,
+    (google.api.resource_reference) = {
+      type: "bigtable.googleapis.com/Backup"
+    }
+  ];
+}
+
+// The request for [DeleteBackup][google.bigtable.admin.v2.BigtableTableAdmin.DeleteBackup].
 message DeleteBackupRequest {
   // Required. Name of the backup to delete.
   // Values are of the form
   // `projects/{project}/instances/{instance}/clusters/{cluster}/backups/{backup}`.
   string name = 1 [
     (google.api.field_behavior) = REQUIRED,
-    (google.api.resource_reference) = { type: "bigtable.googleapis.com/Backup" }
+    (google.api.resource_reference) = {
+      type: "bigtable.googleapis.com/Backup"
+    }
   ];
 }
 
-// The request for
-// [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
+// The request for [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
 message ListBackupsRequest {
-  // Required. The cluster to list backups from. Values are of the
+  // Required. The cluster to list backups from.  Values are of the
   // form `projects/{project}/instances/{instance}/clusters/{cluster}`.
   // Use `{cluster} = '-'` to list backups for all clusters in an instance,
   // e.g., `projects/{project}/instances/{instance}/clusters/-`.
@@ -849,7 +928,7 @@ message ListBackupsRequest {
   // The expression must specify the field name, a comparison operator,
   // and the value that you want to use for filtering. The value must be a
   // string, a number, or a boolean. The comparison operator must be
-  // <, >, <=, >=, !=, =, or :. Colon ‘:’ represents a HAS operator which is
+  // <, >, <=, >=, !=, =, or :. Colon ':' represents a HAS operator which is
   // roughly synonymous with equality. Filter rules are case insensitive.
   //
   // The fields eligible for filtering are:
@@ -880,9 +959,8 @@ message ListBackupsRequest {
   string filter = 2;
 
   // An expression for specifying the sort order of the results of the request.
-  // The string value should specify one or more fields in
-  // [Backup][google.bigtable.admin.v2.Backup]. The full syntax is described at
-  // https://aip.dev/132#ordering.
+  // The string value should specify one or more fields in [Backup][google.bigtable.admin.v2.Backup]. The full
+  // syntax is described at https://aip.dev/132#ordering.
   //
   // Fields supported are:
   //    * name
@@ -907,88 +985,19 @@ message ListBackupsRequest {
   int32 page_size = 4;
 
   // If non-empty, `page_token` should contain a
-  // [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token]
-  // from a previous
-  // [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the
-  // same `parent` and with the same `filter`.
+  // [next_page_token][google.bigtable.admin.v2.ListBackupsResponse.next_page_token] from a
+  // previous [ListBackupsResponse][google.bigtable.admin.v2.ListBackupsResponse] to the same `parent` and with the same
+  // `filter`.
   string page_token = 5;
 }
 
-// The response for
-// [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
+// The response for [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups].
 message ListBackupsResponse {
   // The list of matching backups.
   repeated Backup backups = 1;
 
   // `next_page_token` can be sent in a subsequent
-  // [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call
-  // to fetch more of the matching backups.
+  // [ListBackups][google.bigtable.admin.v2.BigtableTableAdmin.ListBackups] call to fetch more
+  // of the matching backups.
   string next_page_token = 2;
 }
-
-// The request for
-// [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable].
-message RestoreTableRequest {
-  // Required. The name of the instance in which to create the restored
-  // table. This instance must be the parent of the source backup. Values are
-  // of the form `projects//instances/`.
-  string parent = 1;
-
-  // Required. The id of the table to create and restore to. This
-  // table must not already exist. The `table_id` appended to
-  // `parent` forms the full table name of the form
-  // `projects//instances//tables/`.
-  string table_id = 2;
-
-  // Required. The source from which to restore.
-  oneof source {
-    // Name of the backup from which to restore. Values are of the form
-    // `projects//instances//clusters//backups/`.
-    string backup = 3;
-  }
-}
-
-// Metadata type for the long-running operation returned by
-// [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable].
-message RestoreTableMetadata {
-  // Name of the table being created and restored to.
-  string name = 1;
-
-  // The type of the restore source.
-  RestoreSourceType source_type = 2;
-
-  // Information about the source used to restore the table, as specified by
-  // `source` in
-  // [RestoreTableRequest][google.bigtable.admin.v2.RestoreTableRequest].
-  oneof source_info {
-    BackupInfo backup_info = 3;
-  }
-
-  // If exists, the name of the long-running operation that will be used to
-  // track the post-restore optimization process to optimize the performance of
-  // the restored table. The metadata type of the long-running operation is
-  // [OptimizeRestoreTableMetadata][]. The response type is
-  // [Empty][google.protobuf.Empty]. This long-running operation may be
-  // automatically created by the system if applicable after the
-  // RestoreTable long-running operation completes successfully. This operation
-  // may not be created if the table is already optimized or the restore was
-  // not successful.
-  string optimize_table_operation_name = 4;
-
-  // The progress of the
-  // [RestoreTable][google.bigtable.admin.v2.BigtableTableAdmin.RestoreTable]
-  // operation.
-  OperationProgress progress = 5;
-}
-
-// Metadata type for the long-running operation used to track the progress
-// of optimizations performed on a newly restored table. This long-running
-// operation is automatically created by the system after the successful
-// completion of a table restore, and cannot be cancelled.
-message OptimizeRestoredTableMetadata {
-  // Name of the restored table being optimized.
-  string name = 1;
-
-  // The progress of the post-restore optimizations.
-  OperationProgress progress = 2;
-}
diff --git a/synth.metadata b/synth.metadata
index ceadf7037c..434245b8a1 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-bigtable.git",
-        "sha": "45535c4e7d2bffd12992ddd68ac05f0b65b4f62e"
+        "sha": "682d06e1e120ea31919116d8d5cc9be64bdeac39"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "3a935fab757e09c72afd4aa121147a4c97dccc3e",
-        "internalRef": "336931287"
+        "sha": "ccd6462d31e6422fd188b6590aa8d0ad03e7d9a3",
+        "internalRef": "339464550"
       }
     },
     {

From 0b029774d171403f1770a0cb3b6e0f0a6904f1ef Mon Sep 17 00:00:00 2001
From: WhiteSource Renovate 
Date: Thu, 12 Nov 2020 19:16:11 +0100
Subject: [PATCH 6/9] chore(deps): update dependency
 com.google.cloud:libraries-bom to v15.1.0 (#532)

This PR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | minor | `15.0.0` -> `15.1.0` |

---

### Renovate configuration

:date: **Schedule**: At any time (no schedule defined).

:vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

:recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

:no_bell: **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] If you want to rebase/retry this PR, check this box

---

This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/java-bigtable).
---
 samples/snippets/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
index ac625b6dbb..e0c4d6f039 100644
--- a/samples/snippets/pom.xml
+++ b/samples/snippets/pom.xml
@@ -30,7 +30,7 @@
       
         com.google.cloud
         libraries-bom
-        15.0.0
+        15.1.0
         pom
         import
       

From e7d636aa6ced809674186b5f7ef1c4ca7a810840 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot 
Date: Fri, 13 Nov 2020 07:20:42 -0800
Subject: [PATCH 7/9] build(java): use code-suggester v1 tag rather than full
 semver (#534)

Source-Author: Jeff Ching 
Source-Date: Thu Nov 12 10:07:08 2020 -0800
Source-Repo: googleapis/synthtool
Source-Sha: 7d652819519dfa24da9e14548232e4aaba71a11c
Source-Link: https://github.com/googleapis/synthtool/commit/7d652819519dfa24da9e14548232e4aaba71a11c
---
 .github/workflows/formatting.yaml | 2 +-
 synth.metadata                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/formatting.yaml b/.github/workflows/formatting.yaml
index d4d367cfce..6844407b4d 100644
--- a/.github/workflows/formatting.yaml
+++ b/.github/workflows/formatting.yaml
@@ -18,7 +18,7 @@ jobs:
         with:
           java-version: 11
       - run: "mvn com.coveo:fmt-maven-plugin:format"
-      - uses: googleapis/code-suggester@v1.8.0
+      - uses: googleapis/code-suggester@v1
         with:
           command: review
           pull_number: ${{ github.event.pull_request.number }}
diff --git a/synth.metadata b/synth.metadata
index 434245b8a1..3314f7c8da 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,7 +4,7 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-bigtable.git",
-        "sha": "682d06e1e120ea31919116d8d5cc9be64bdeac39"
+        "sha": "0b029774d171403f1770a0cb3b6e0f0a6904f1ef"
       }
     },
     {
@@ -19,7 +19,7 @@
       "git": {
         "name": "synthtool",
         "remote": "https://github.com/googleapis/synthtool.git",
-        "sha": "7db8a6c5ffb12a6e4c2f799c18f00f7f3d60e279"
+        "sha": "7d652819519dfa24da9e14548232e4aaba71a11c"
       }
     }
   ],

From f5f66c9ce019a6a24ddfe1efc0141835f5a02f34 Mon Sep 17 00:00:00 2001
From: Sushan Bhattarai 
Date: Fri, 13 Nov 2020 12:20:11 -0700
Subject: [PATCH 8/9] fix: make keepalive params a bit conservative (#528)

---
 .../google/cloud/bigtable/data/v2/BigtableDataSettings.java    | 3 +--
 .../bigtable/data/v2/stub/EnhancedBigtableStubSettings.java    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
index 105fbaae45..f4d63b5ec0 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/BigtableDataSettings.java
@@ -124,10 +124,9 @@ public ManagedChannelBuilder apply(ManagedChannelBuilder input) {
                         return input.usePlaintext();
                       }
                     })
-                .setKeepAliveTime(Duration.ofSeconds(10)) // sends ping in this interval
+                .setKeepAliveTime(Duration.ofSeconds(30)) // sends ping in this interval
                 .setKeepAliveTimeout(
                     Duration.ofSeconds(10)) // wait this long before considering the connection dead
-                .setKeepAliveWithoutCalls(true) // sends ping without active streams
                 .build());
 
     LOGGER.info("Connecting to the Bigtable emulator at " + hostname + ":" + port);
diff --git a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
index 0ce05d3a52..788aa1d3b0 100644
--- a/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
+++ b/google-cloud-bigtable/src/main/java/com/google/cloud/bigtable/data/v2/stub/EnhancedBigtableStubSettings.java
@@ -245,10 +245,9 @@ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProvi
     return BigtableStubSettings.defaultGrpcTransportProviderBuilder()
         .setPoolSize(getDefaultChannelPoolSize())
         .setMaxInboundMessageSize(MAX_MESSAGE_SIZE)
-        .setKeepAliveTime(Duration.ofSeconds(10)) // sends ping in this interval
+        .setKeepAliveTime(Duration.ofSeconds(30)) // sends ping in this interval
         .setKeepAliveTimeout(
             Duration.ofSeconds(10)) // wait this long before considering the connection dead
-        .setKeepAliveWithoutCalls(true) // sends ping without active streams
         // TODO(weiranf): Set this to true by default once DirectPath goes to public beta
         .setAttemptDirectPath(isDirectPathEnabled());
   }

From 4c4a73c20bbea90f925551dffecba3584c53bd67 Mon Sep 17 00:00:00 2001
From: "release-please[bot]"
 <55107282+release-please[bot]@users.noreply.github.com>
Date: Mon, 16 Nov 2020 17:52:03 +0000
Subject: [PATCH 9/9] chore: release 1.18.0 (#531)

:robot: I have created a release \*beep\* \*boop\*
---
## [1.18.0](https://www.github.com/googleapis/java-bigtable/compare/v1.17.3...v1.18.0) (2020-11-13)


### Features

* **autogenerated:** Update BigtableTableAdmin GetIamPolicy to include the additional binding for Backup, Change DeleteAppProfileRequest.ignore_warnings to REQUIRED. ([#530](https://www.github.com/googleapis/java-bigtable/issues/530)) ([8c16fa4](https://www.github.com/googleapis/java-bigtable/commit/8c16fa4c5290f67c43392953095bd759c2505bdb))


### Bug Fixes

* make keepalive params a bit conservative ([#528](https://www.github.com/googleapis/java-bigtable/issues/528)) ([f5f66c9](https://www.github.com/googleapis/java-bigtable/commit/f5f66c9ce019a6a24ddfe1efc0141835f5a02f34))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please).
---
 CHANGELOG.md                                 | 12 ++++++++++++
 README.md                                    |  6 +++---
 google-cloud-bigtable-bom/pom.xml            | 14 +++++++-------
 google-cloud-bigtable-deps-bom/pom.xml       |  2 +-
 google-cloud-bigtable-emulator/pom.xml       |  8 ++++----
 google-cloud-bigtable/pom.xml                | 10 +++++-----
 grpc-google-cloud-bigtable-admin-v2/pom.xml  |  8 ++++----
 grpc-google-cloud-bigtable-v2/pom.xml        |  8 ++++----
 pom.xml                                      |  2 +-
 proto-google-cloud-bigtable-admin-v2/pom.xml |  8 ++++----
 proto-google-cloud-bigtable-v2/pom.xml       |  8 ++++----
 samples/snapshot/pom.xml                     |  2 +-
 versions.txt                                 | 12 ++++++------
 13 files changed, 56 insertions(+), 44 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45500fb383..1d31006aef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.18.0](https://www.github.com/googleapis/java-bigtable/compare/v1.17.3...v1.18.0) (2020-11-13)
+
+
+### Features
+
+* **autogenerated:** Update BigtableTableAdmin GetIamPolicy to include the additional binding for Backup, Change DeleteAppProfileRequest.ignore_warnings to REQUIRED. ([#530](https://www.github.com/googleapis/java-bigtable/issues/530)) ([8c16fa4](https://www.github.com/googleapis/java-bigtable/commit/8c16fa4c5290f67c43392953095bd759c2505bdb))
+
+
+### Bug Fixes
+
+* make keepalive params a bit conservative ([#528](https://www.github.com/googleapis/java-bigtable/issues/528)) ([f5f66c9](https://www.github.com/googleapis/java-bigtable/commit/f5f66c9ce019a6a24ddfe1efc0141835f5a02f34))
+
 ### [1.17.3](https://www.github.com/googleapis/java-bigtable/compare/v1.17.2...v1.17.3) (2020-11-11)
 
 
diff --git a/README.md b/README.md
index 5d46bf350d..2f3b015d6e 100644
--- a/README.md
+++ b/README.md
@@ -16,16 +16,16 @@ If you are using Maven, add this to your pom.xml file
 
   com.google.cloud
   google-cloud-bigtable
-  1.17.3
+  1.18.0
 
 ```
 If you are using Gradle, add this to your dependencies
 ```Groovy
-compile 'com.google.cloud:google-cloud-bigtable:1.17.3'
+compile 'com.google.cloud:google-cloud-bigtable:1.18.0'
 ```
 If you are using SBT, add this to your dependencies
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.17.3"
+libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "1.18.0"
 ```
 [//]: # ({x-version-update-end})
 
diff --git a/google-cloud-bigtable-bom/pom.xml b/google-cloud-bigtable-bom/pom.xml
index d792116407..5fe3384fe4 100644
--- a/google-cloud-bigtable-bom/pom.xml
+++ b/google-cloud-bigtable-bom/pom.xml
@@ -3,7 +3,7 @@
     4.0.0
     com.google.cloud
     google-cloud-bigtable-bom
-    1.17.4-SNAPSHOT
+    1.18.0
     pom
     
         com.google.cloud
@@ -72,32 +72,32 @@
             
                 com.google.cloud
                 google-cloud-bigtable
-                1.17.4-SNAPSHOT
+                1.18.0
             
             
                 com.google.cloud
                 google-cloud-bigtable-emulator
-                0.126.4-SNAPSHOT
+                0.127.0
             
             
                 com.google.api.grpc
                 grpc-google-cloud-bigtable-admin-v2
-                1.17.4-SNAPSHOT
+                1.18.0
             
             
                 com.google.api.grpc
                 grpc-google-cloud-bigtable-v2
-                1.17.4-SNAPSHOT
+                1.18.0
             
             
                 com.google.api.grpc
                 proto-google-cloud-bigtable-admin-v2
-                1.17.4-SNAPSHOT
+                1.18.0
             
             
                 com.google.api.grpc
                 proto-google-cloud-bigtable-v2
-                1.17.4-SNAPSHOT
+                1.18.0
             
         
     
diff --git a/google-cloud-bigtable-deps-bom/pom.xml b/google-cloud-bigtable-deps-bom/pom.xml
index 87a505e4bc..b01ed2965b 100644
--- a/google-cloud-bigtable-deps-bom/pom.xml
+++ b/google-cloud-bigtable-deps-bom/pom.xml
@@ -12,7 +12,7 @@
 
   com.google.cloud
   google-cloud-bigtable-deps-bom
-  1.17.4-SNAPSHOT
+  1.18.0
 
   pom
   
diff --git a/google-cloud-bigtable-emulator/pom.xml b/google-cloud-bigtable-emulator/pom.xml
index 5f6abf6f13..05538d6945 100644
--- a/google-cloud-bigtable-emulator/pom.xml
+++ b/google-cloud-bigtable-emulator/pom.xml
@@ -5,7 +5,7 @@
   4.0.0
 
   google-cloud-bigtable-emulator
-  0.126.4-SNAPSHOT
+  0.127.0
   Google Cloud Java - Bigtable Emulator
   https://github.com/googleapis/java-bigtable
   
@@ -14,7 +14,7 @@
   
     com.google.cloud
     google-cloud-bigtable-parent
-    1.17.4-SNAPSHOT
+    1.18.0
   
   
     scm:git:git@github.com:googleapis/java-bigtable.git
@@ -80,14 +80,14 @@
       
         com.google.cloud
         google-cloud-bigtable-deps-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
       
         com.google.cloud
         google-cloud-bigtable-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
diff --git a/google-cloud-bigtable/pom.xml b/google-cloud-bigtable/pom.xml
index 1c4412d275..d0106ee047 100644
--- a/google-cloud-bigtable/pom.xml
+++ b/google-cloud-bigtable/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
   google-cloud-bigtable
-  1.17.4-SNAPSHOT
+  1.18.0
   jar
   Google Cloud Bigtable
   https://github.com/googleapis/java-bigtable
@@ -12,11 +12,11 @@
   
     com.google.cloud
     google-cloud-bigtable-parent
-    1.17.4-SNAPSHOT
+    1.18.0
   
   
     
-    1.17.4-SNAPSHOT
+    1.18.0
 
     google-cloud-bigtable
 
@@ -39,14 +39,14 @@
       
         com.google.cloud
         google-cloud-bigtable-deps-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
       
         com.google.cloud
         google-cloud-bigtable-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
diff --git a/grpc-google-cloud-bigtable-admin-v2/pom.xml b/grpc-google-cloud-bigtable-admin-v2/pom.xml
index acfe7eeaad..34733f3fa0 100644
--- a/grpc-google-cloud-bigtable-admin-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-bigtable-admin-v2
-  1.17.4-SNAPSHOT
+  1.18.0
   grpc-google-cloud-bigtable-admin-v2
   GRPC library for grpc-google-cloud-bigtable-admin-v2
   
     com.google.cloud
     google-cloud-bigtable-parent
-    1.17.4-SNAPSHOT
+    1.18.0
   
 
   
@@ -18,14 +18,14 @@
       
         com.google.cloud
         google-cloud-bigtable-deps-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
       
         com.google.cloud
         google-cloud-bigtable-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
diff --git a/grpc-google-cloud-bigtable-v2/pom.xml b/grpc-google-cloud-bigtable-v2/pom.xml
index 8785b8fb51..0437413085 100644
--- a/grpc-google-cloud-bigtable-v2/pom.xml
+++ b/grpc-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   grpc-google-cloud-bigtable-v2
-  1.17.4-SNAPSHOT
+  1.18.0
   grpc-google-cloud-bigtable-v2
   GRPC library for grpc-google-cloud-bigtable-v2
   
     com.google.cloud
     google-cloud-bigtable-parent
-    1.17.4-SNAPSHOT
+    1.18.0
   
 
   
@@ -18,14 +18,14 @@
       
         com.google.cloud
         google-cloud-bigtable-deps-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
       
         com.google.cloud
         google-cloud-bigtable-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
diff --git a/pom.xml b/pom.xml
index 8483b503b7..b7cbd4af10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     google-cloud-bigtable-parent
     pom
-    1.17.4-SNAPSHOT
+    1.18.0
     Google Cloud Bigtable Parent
     https://github.com/googleapis/java-bigtable
     
diff --git a/proto-google-cloud-bigtable-admin-v2/pom.xml b/proto-google-cloud-bigtable-admin-v2/pom.xml
index 7605ee37b9..7aac6b1bf8 100644
--- a/proto-google-cloud-bigtable-admin-v2/pom.xml
+++ b/proto-google-cloud-bigtable-admin-v2/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   proto-google-cloud-bigtable-admin-v2
-  1.17.4-SNAPSHOT
+  1.18.0
   proto-google-cloud-bigtable-admin-v2
   PROTO library for proto-google-cloud-bigtable-admin-v2
   
     com.google.cloud
     google-cloud-bigtable-parent
-    1.17.4-SNAPSHOT
+    1.18.0
   
 
   
@@ -18,14 +18,14 @@
       
         com.google.cloud
         google-cloud-bigtable-deps-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
       
         com.google.cloud
         google-cloud-bigtable-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
diff --git a/proto-google-cloud-bigtable-v2/pom.xml b/proto-google-cloud-bigtable-v2/pom.xml
index b37f19841a..53f707e6c9 100644
--- a/proto-google-cloud-bigtable-v2/pom.xml
+++ b/proto-google-cloud-bigtable-v2/pom.xml
@@ -4,13 +4,13 @@
   4.0.0
   com.google.api.grpc
   proto-google-cloud-bigtable-v2
-  1.17.4-SNAPSHOT
+  1.18.0
   proto-google-cloud-bigtable-v2
   PROTO library for proto-google-cloud-bigtable-v2
   
     com.google.cloud
     google-cloud-bigtable-parent
-    1.17.4-SNAPSHOT
+    1.18.0
   
 
   
@@ -18,14 +18,14 @@
       
         com.google.cloud
         google-cloud-bigtable-deps-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
       
         com.google.cloud
         google-cloud-bigtable-bom
-        1.17.4-SNAPSHOT
+        1.18.0
         pom
         import
       
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
index 744ce31eb0..1218fa9766 100644
--- a/samples/snapshot/pom.xml
+++ b/samples/snapshot/pom.xml
@@ -28,7 +28,7 @@
     
       com.google.cloud
       google-cloud-bigtable
-      1.17.4-SNAPSHOT
+      1.18.0
     
   
 
diff --git a/versions.txt b/versions.txt
index 9e74ec90e2..856c3f5ca0 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,9 +1,9 @@
 # Format:
 # module:released-version:current-version
 
-google-cloud-bigtable:1.17.3:1.17.4-SNAPSHOT
-grpc-google-cloud-bigtable-admin-v2:1.17.3:1.17.4-SNAPSHOT
-grpc-google-cloud-bigtable-v2:1.17.3:1.17.4-SNAPSHOT
-proto-google-cloud-bigtable-admin-v2:1.17.3:1.17.4-SNAPSHOT
-proto-google-cloud-bigtable-v2:1.17.3:1.17.4-SNAPSHOT
-google-cloud-bigtable-emulator:0.126.3:0.126.4-SNAPSHOT
+google-cloud-bigtable:1.18.0:1.18.0
+grpc-google-cloud-bigtable-admin-v2:1.18.0:1.18.0
+grpc-google-cloud-bigtable-v2:1.18.0:1.18.0
+proto-google-cloud-bigtable-admin-v2:1.18.0:1.18.0
+proto-google-cloud-bigtable-v2:1.18.0:1.18.0
+google-cloud-bigtable-emulator:0.127.0:0.127.0